feat(oidc): allow for the use of secret csi drivers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
kiali · Mar 8, 2024 · dade372 · dade372
1 parent 8c55d96
commit dade372
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/kiali-server/templates/deployment.yaml b/kiali-server/templates/deployment.yaml
@@ -165,10 +165,14 @@ spec:
       {{- end }}
       {{- range .Values.deployment.custom_secrets }}
       - name: {{ .name }}
+      {{- if .csi}}
+        csi: {{ toYaml .csi | nindent 10 }}
+      {{- else }}
         secret:
           secretName: {{ .name }}
           optional: {{ .optional | default false }}
       {{- end }}
+      {{- end }}
       {{- range $key, $val := (include "kiali-server.remote-cluster-secrets" .) | fromJson }}
       - name: {{ $key }}
         secret:
@@ -179,10 +183,6 @@ spec:
         secret:
           secretName: {{ .secret_name }}
       {{- end }}
-      {{- range .Values.deployment.csiVolumes }}
-      - name: {{ .name }}
-        csi: {{ toYaml .csi | nindent 10 }}
-      {{- end }}
       {{- if or (.Values.deployment.affinity.node) (or (.Values.deployment.affinity.pod) (.Values.deployment.affinity.pod_anti)) }}
       affinity:
         {{- if .Values.deployment.affinity.node }}

diff --git a/kiali-server/values.yaml b/kiali-server/values.yaml
@@ -87,7 +87,6 @@ deployment:
   tolerations: []
   version_label: ${HELM_IMAGE_TAG} # v1.39 # v1.39.0 # see: https://quay.io/repository/kiali/kiali?tab=tags
   view_only_mode: false
-  csiVolumes: []
 external_services:
   custom_dashboards:
     enabled: true