Skip to content

Commit 0ec0c25

Browse files
authored
fix: mount flyte-secret-auth secret conditionally (#4914)
Signed-off-by: Ryan Lo <[email protected]>
1 parent 95333b4 commit 0ec0c25

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

charts/flyte-core/templates/clusterresourcesync/deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ spec:
3838
{{- if not .Values.cluster_resource_manager.config.cluster_resources.standaloneDeployment }}
3939
{{- include "databaseSecret.volumeMount" . | nindent 10 }}
4040
{{- else }}
41+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
4142
- name: auth
4243
mountPath: /etc/secrets/
4344
{{- end }}
45+
{{- end }}
4446
- mountPath: /etc/flyte/clusterresource/templates
4547
name: resource-templates
4648
- mountPath: /etc/flyte/config
@@ -66,10 +68,12 @@ spec:
6668
secretName: cluster-credentials
6769
{{- end }}
6870
{{- if .Values.cluster_resource_manager.config.cluster_resources.standaloneDeployment }}
71+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
6972
- name: auth
7073
secret:
7174
secretName: flyte-secret-auth
7275
{{- end }}
76+
{{- end }}
7377
{{- with .Values.cluster_resource_manager.nodeSelector }}
7478
nodeSelector: {{ tpl (toYaml .) $ | nindent 8 }}
7579
{{- end }}

charts/flyte-core/templates/flytescheduler/deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ spec:
7676
volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
7777
- mountPath: /etc/flyte/config
7878
name: config-volume
79+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
7980
- name: auth
8081
mountPath: /etc/secrets/
82+
{{- end }}
8183
{{- with .Values.flytescheduler.additionalVolumeMounts -}}
8284
{{ tpl (toYaml .) $ | nindent 8 }}
8385
{{- end }}
@@ -91,9 +93,11 @@ spec:
9193
- configMap:
9294
name: flyte-scheduler-config
9395
name: config-volume
96+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
9497
- name: auth
9598
secret:
9699
secretName: flyte-secret-auth
100+
{{- end }}
97101
{{- with .Values.flytescheduler.additionalVolumes -}}
98102
{{ tpl (toYaml .) $ | nindent 6 }}
99103
{{- end }}

charts/flyte-core/templates/propeller/deployment.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ spec:
8282
volumeMounts:
8383
- name: config-volume
8484
mountPath: /etc/flyte/config
85+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
8586
- name: auth
8687
mountPath: /etc/secrets/
88+
{{- end }}
8789
{{- with .Values.flytepropeller.additionalVolumeMounts -}}
8890
{{ tpl (toYaml .) $ | nindent 8 }}
8991
{{- end }}
@@ -98,9 +100,11 @@ spec:
98100
- configMap:
99101
name: flyte-propeller-config
100102
name: config-volume
103+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
101104
- name: auth
102105
secret:
103106
secretName: flyte-secret-auth
107+
{{- end }}
104108
{{- with .Values.flytepropeller.additionalVolumes -}}
105109
{{ tpl (toYaml .) $ | nindent 6 }}
106110
{{- end }}

charts/flyte-core/templates/propeller/manager.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ template:
4343
volumeMounts:
4444
- name: config-volume
4545
mountPath: /etc/flyte/config
46+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
4647
- name: auth
4748
mountPath: /etc/secrets/
49+
{{- end }}
4850
{{- if .Values.flytepropeller.terminationMessagePolicy }}
4951
terminationMessagePolicy: "{{ .Values.flytepropeller.terminationMessagePolicy }}"
5052
{{- end }}
@@ -53,9 +55,11 @@ template:
5355
- configMap:
5456
name: flyte-propeller-config
5557
name: config-volume
58+
{{- if .Values.secrets.adminOauthClientCredentials.enabled }}
5659
- name: auth
5760
secret:
5861
secretName: flyte-secret-auth
62+
{{- end }}
5963
{{- with .Values.flytepropeller.nodeSelector }}
6064
nodeSelector: {{ tpl (toYaml .) $ | nindent 6 }}
6165
{{- end }}

0 commit comments

Comments
 (0)