fix: mount flyte-secret-auth secret conditionally (#4914)

Signed-off-by: Ryan Lo <[email protected]>
flyteorg · Feb 20, 2024 · 0ec0c25 · 0ec0c25
1 parent 95333b4
commit 0ec0c25
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/charts/flyte-core/templates/clusterresourcesync/deployment.yaml b/charts/flyte-core/templates/clusterresourcesync/deployment.yaml
@@ -38,9 +38,11 @@ spec:
           {{- if not .Values.cluster_resource_manager.config.cluster_resources.standaloneDeployment  }}
           {{- include "databaseSecret.volumeMount" . | nindent 10 }}
           {{- else }}
+          {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
           - name: auth
             mountPath: /etc/secrets/
           {{- end }}
+          {{- end }}
           - mountPath: /etc/flyte/clusterresource/templates
             name: resource-templates
           - mountPath: /etc/flyte/config
@@ -66,10 +68,12 @@ spec:
             secretName: cluster-credentials
         {{- end }}
         {{- if .Values.cluster_resource_manager.config.cluster_resources.standaloneDeployment }}
+        {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
         - name: auth
           secret:
             secretName: flyte-secret-auth
         {{- end }}
+        {{- end }}
       {{- with .Values.cluster_resource_manager.nodeSelector }}
       nodeSelector: {{ tpl (toYaml .) $ | nindent 8 }}
       {{- end }}

diff --git a/charts/flyte-core/templates/flytescheduler/deployment.yaml b/charts/flyte-core/templates/flytescheduler/deployment.yaml
@@ -76,8 +76,10 @@ spec:
         volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
         - mountPath: /etc/flyte/config
           name: config-volume
+        {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
         - name: auth
           mountPath: /etc/secrets/
+        {{- end }}
         {{- with .Values.flytescheduler.additionalVolumeMounts -}}
         {{ tpl (toYaml .) $ | nindent 8 }}
         {{- end }}
@@ -91,9 +93,11 @@ spec:
       - configMap:
           name: flyte-scheduler-config
         name: config-volume
+      {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
       - name: auth
         secret:
           secretName: flyte-secret-auth
+      {{- end }}
       {{- with .Values.flytescheduler.additionalVolumes -}}
       {{ tpl (toYaml .) $ | nindent 6 }}
       {{- end }}

diff --git a/charts/flyte-core/templates/propeller/deployment.yaml b/charts/flyte-core/templates/propeller/deployment.yaml
@@ -82,8 +82,10 @@ spec:
         volumeMounts:
         - name: config-volume
           mountPath: /etc/flyte/config
+        {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
         - name: auth
           mountPath: /etc/secrets/
+        {{- end }}
         {{- with .Values.flytepropeller.additionalVolumeMounts -}}
         {{ tpl (toYaml .) $ | nindent 8 }}
         {{- end }}
@@ -98,9 +100,11 @@ spec:
       - configMap:
           name: flyte-propeller-config
         name: config-volume
+      {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
       - name: auth
         secret:
           secretName: flyte-secret-auth
+      {{- end }}
       {{- with .Values.flytepropeller.additionalVolumes -}}
       {{ tpl (toYaml .) $ | nindent 6 }}
       {{- end }}

diff --git a/charts/flyte-core/templates/propeller/manager.yaml b/charts/flyte-core/templates/propeller/manager.yaml
@@ -43,8 +43,10 @@ template:
       volumeMounts:
         - name: config-volume
           mountPath: /etc/flyte/config
+        {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
         - name: auth
           mountPath: /etc/secrets/
+        {{- end }}
       {{- if .Values.flytepropeller.terminationMessagePolicy }}
       terminationMessagePolicy: "{{ .Values.flytepropeller.terminationMessagePolicy }}"
       {{- end }}
@@ -53,9 +55,11 @@ template:
     - configMap:
         name: flyte-propeller-config
       name: config-volume
+    {{- if .Values.secrets.adminOauthClientCredentials.enabled }}
     - name: auth
       secret:
         secretName: flyte-secret-auth
+    {{- end }}
     {{- with .Values.flytepropeller.nodeSelector }}
     nodeSelector: {{ tpl (toYaml .) $ | nindent 6 }}
     {{- end }}