From a071bade39bdad80fff042c235a1c3c046a82a09 Mon Sep 17 00:00:00 2001
From: gdabisias <gdabisias@nvidia.com>
Date: Tue, 29 Aug 2023 16:20:34 +0200
Subject: [PATCH] Fix init container secret

Signed-off-by: gdabisias <gdabisias@nvidia.com>
---
 charts/flyte-core/templates/admin/deployment.yaml      | 4 +++-
 deployment/eks/flyte_aws_scheduler_helm_generated.yaml | 2 --
 deployment/eks/flyte_helm_controlplane_generated.yaml  | 2 --
 deployment/eks/flyte_helm_generated.yaml               | 2 --
 deployment/gcp/flyte_helm_controlplane_generated.yaml  | 2 --
 deployment/gcp/flyte_helm_generated.yaml               | 2 --
 deployment/sandbox/flyte_helm_generated.yaml           | 2 --
 7 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/charts/flyte-core/templates/admin/deployment.yaml b/charts/flyte-core/templates/admin/deployment.yaml
index 81587d1973..b7cf2a1487 100755
--- a/charts/flyte-core/templates/admin/deployment.yaml
+++ b/charts/flyte-core/templates/admin/deployment.yaml
@@ -72,8 +72,10 @@ spec:
             name: clusters-config-volume
           - mountPath: /etc/secrets/
             name: admin-secrets
+          {{- if gt (len .Values.configmap.clusters.labelClusterMap) 0 }}
           - mountPath: /var/run/credentials
-            name: cluster-secrets
+            name: cluster-credentials
+          {{- end }}
         {{- end }}
         - name: generate-secrets
           image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
index 23004e5329..1d7f38973f 100644
--- a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
+++ b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -912,8 +912,6 @@ 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
index 98865881a0..67f3c30ade 100644
--- a/deployment/eks/flyte_helm_controlplane_generated.yaml
+++ b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -618,8 +618,6 @@ 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
index ac726f0b0b..1d9d44f45e 100644
--- a/deployment/eks/flyte_helm_generated.yaml
+++ b/deployment/eks/flyte_helm_generated.yaml
@@ -943,8 +943,6 @@ 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
index 2fea809bf7..4f0981d1cd 100644
--- a/deployment/gcp/flyte_helm_controlplane_generated.yaml
+++ b/deployment/gcp/flyte_helm_controlplane_generated.yaml
@@ -633,8 +633,6 @@ 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
index 1f2e5b8c4c..c51da57718 100644
--- a/deployment/gcp/flyte_helm_generated.yaml
+++ b/deployment/gcp/flyte_helm_generated.yaml
@@ -966,8 +966,6 @@ 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
index aa626de336..ba20c28212 100644
--- a/deployment/sandbox/flyte_helm_generated.yaml
+++ b/deployment/sandbox/flyte_helm_generated.yaml
@@ -6786,8 +6786,6 @@ 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"