Fix flyte-core helm charts for multi cluster configuration (#3993)

* Fix cluster secrets access for flyte-core helm charts when used in multi-cluster setup Signed-off-by: gdabisias <[email protected]> * Fix init container secret Signed-off-by: gdabisias <[email protected]> * Fix secret name Signed-off-by: gdabisias <[email protected]> * Generalise volume mounting points Signed-off-by: gdabisias <[email protected]> --------- Signed-off-by: gdabisias <[email protected]>
flyteorg · Sep 27, 2023 · b52bbe2 · b52bbe2
1 parent 8c05f4e
commit b52bbe2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/charts/flyte-core/templates/admin/deployment.yaml b/charts/flyte-core/templates/admin/deployment.yaml
@@ -72,6 +72,11 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          {{- if gt (len .Values.configmap.clusters.labelClusterMap) 0 }}
+          {{- with .Values.flyteadmin.additionalVolumeMounts -}}
+          {{ tpl (toYaml .) $ | nindent 10 }}
+          {{- end }}
+          {{- end }}
         {{- end }}
         - name: generate-secrets
           image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"

diff --git a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
@@ -41,7 +41,7 @@ spec:
             name: config-volume
           {{- if gt (len .Values.configmap.clusters.labelClusterMap) 0 }}
           - mountPath: /var/run/credentials
-            name: flyte-admin-secrets
+            name: cluster-secrets
           {{- end }}
       serviceAccountName: {{ .Values.cluster_resource_manager.service_account_name }}
       {{- if .Values.cluster_resource_manager.resources }}
@@ -55,9 +55,9 @@ spec:
             name: flyte-clusterresourcesync-config
           name: config-volume
         {{- if gt (len .Values.configmap.clusters.labelClusterMap) 0 }}
-        - name: flyte-admin-secrets
+        - name: cluster-secrets
           secret:
-            secretName: flyte-admin-secrets
+            secretName: cluster-credentials
         {{- end }}
         {{- if .Values.cluster_resource_manager.config.cluster_resources.standaloneDeployment }}
         - name: auth