From 1462a8a3841497cd943b0fcb8a2afc79a681a938 Mon Sep 17 00:00:00 2001 From: gdabisias Date: Fri, 25 Aug 2023 15:43:00 +0200 Subject: [PATCH] Fix cluster secrets access for flyte-core helm charts when used in multi-cluster setup Signed-off-by: gdabisias --- charts/flyte-core/templates/admin/deployment.yaml | 2 ++ .../templates/clusterresourcesync/deployment.yaml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/flyte-core/templates/admin/deployment.yaml b/charts/flyte-core/templates/admin/deployment.yaml index 97deb99457b..81587d19739 100755 --- a/charts/flyte-core/templates/admin/deployment.yaml +++ b/charts/flyte-core/templates/admin/deployment.yaml @@ -72,6 +72,8 @@ spec: name: clusters-config-volume - mountPath: /etc/secrets/ name: admin-secrets + - mountPath: /var/run/credentials + name: cluster-secrets {{- 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 index b89a599ab78..7f3ad78269b 100644 --- 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-secrets {{- end }} {{- if .Values.cluster_resource_manager.config.cluster_resources.standaloneDeployment }} - name: auth