Fix cluster secrets access for flyte-core helm charts when used in mu…

…lti-cluster setup Signed-off-by: gdabisias <[email protected]>
flyteorg · Aug 28, 2023 · 0cc1ef0 · 0cc1ef0
1 parent 516dd39
commit 0cc1ef0
Show file tree

Hide file tree

Showing 8 changed files with 17 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,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
@@ -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

diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -912,6 +912,8 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          - mountPath: /var/run/credentials
+            name: cluster-secrets
         - name: generate-secrets
           image: "cr.flyte.org/flyteorg/flyteadmin:v1.1.118"
           imagePullPolicy: "IfNotPresent"

diff --git a/deployment/eks/flyte_helm_controlplane_generated.yaml b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -618,6 +618,8 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          - mountPath: /var/run/credentials
+            name: cluster-secrets
         - name: generate-secrets
           image: "cr.flyte.org/flyteorg/flyteadmin:v1.1.118"
           imagePullPolicy: "IfNotPresent"

diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
@@ -943,6 +943,8 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          - mountPath: /var/run/credentials
+            name: cluster-secrets
         - name: generate-secrets
           image: "cr.flyte.org/flyteorg/flyteadmin:v1.1.118"
           imagePullPolicy: "IfNotPresent"

diff --git a/deployment/gcp/flyte_helm_controlplane_generated.yaml b/deployment/gcp/flyte_helm_controlplane_generated.yaml
@@ -633,6 +633,8 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          - mountPath: /var/run/credentials
+            name: cluster-secrets
         - name: generate-secrets
           image: "cr.flyte.org/flyteorg/flyteadmin:v1.1.118"
           imagePullPolicy: "IfNotPresent"

diff --git a/deployment/gcp/flyte_helm_generated.yaml b/deployment/gcp/flyte_helm_generated.yaml
@@ -966,6 +966,8 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          - mountPath: /var/run/credentials
+            name: cluster-secrets
         - name: generate-secrets
           image: "cr.flyte.org/flyteorg/flyteadmin:v1.1.118"
           imagePullPolicy: "IfNotPresent"

diff --git a/deployment/sandbox/flyte_helm_generated.yaml b/deployment/sandbox/flyte_helm_generated.yaml
@@ -6786,6 +6786,8 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          - mountPath: /var/run/credentials
+            name: cluster-secrets
         - name: generate-secrets
           image: "cr.flyte.org/flyteorg/flyteadmin:v1.1.118"
           imagePullPolicy: "IfNotPresent"