Skip to content

Commit b8f3252

Browse files
mhotanmhotan
committed
respect templatized repository and image tags
Signed-off-by: Michael Hotan <[email protected]>
1 parent 4cdf120 commit b8f3252

File tree

17 files changed

+87
-24
lines changed

17 files changed

+87
-24
lines changed

‎charts/flyte-core/templates/admin/deployment.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- {{ .Values.flyteadmin.configPath }}
4343
- migrate
4444
- run
45-
image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
45+
image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
4646
imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
4747
name: run-migrations
4848
securityContext:
@@ -74,7 +74,7 @@ spec:
7474
{{- range .Values.flyteadmin.initialProjects }}
7575
- {{ . }}
7676
{{- end }}
77-
image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
77+
image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
7878
imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
7979
name: seed-projects
8080
securityContext:
@@ -98,7 +98,7 @@ spec:
9898
- {{ .Values.flyteadmin.configPath }}
9999
- clusterresource
100100
- sync
101-
image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
101+
image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
102102
imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
103103
name: sync-cluster-resources
104104
securityContext:
@@ -125,7 +125,7 @@ spec:
125125
{{- end }}
126126
{{- end }}
127127
- name: generate-secrets
128-
image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
128+
image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
129129
imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
130130
command: ["/bin/sh", "-c"]
131131
args:
@@ -164,7 +164,7 @@ spec:
164164
{{- tpl (toYaml .) $ | nindent 8 }}
165165
{{- end }}
166166
{{- end }}
167-
image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
167+
image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
168168
imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
169169
name: flyteadmin
170170
ports:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
{{- toYaml . | nindent 10 }}
4646
{{- end }}
4747
{{- end }}
48-
image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
48+
image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
4949
imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
5050
name: sync-cluster-resources
5151
{{- with .Values.cluster_resource_manager.resources }}

‎charts/flyte-core/templates/console/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
priorityClassName: {{ .Values.flyteconsole.priorityClassName }}
4141
{{- end }}
4242
containers:
43-
- image: "{{ .Values.flyteconsole.image.repository }}:{{ .Values.flyteconsole.image.tag }}"
43+
- image: "{{ tpl .Values.flyteconsole.image.repository . }}:{{ tpl .Values.flyteconsole.image.tag . }}"
4444
imagePullPolicy: "{{ .Values.flyteconsole.image.pullPolicy }}"
4545
name: flyteconsole
4646
envFrom:

‎charts/flyte-core/templates/datacatalog/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
- {{ .Values.datacatalog.configPath }}
4343
- migrate
4444
- run
45-
image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
45+
image: "{{ tpl .Values.datacatalog.image.repository . }}:{{ tpl .Values.datacatalog.image.tag . }}"
4646
imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
4747
name: run-migrations
4848
volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
@@ -73,7 +73,7 @@ spec:
7373
{{- toYaml . | nindent 8 }}
7474
{{- end }}
7575
{{- end }}
76-
image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
76+
image: "{{ tpl .Values.datacatalog.image.repository . }}:{{ tpl .Values.datacatalog.image.tag . }}"
7777
imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
7878
name: datacatalog
7979
ports:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
{{- toYaml . | nindent 8 }}
4848
{{- end }}
4949
{{- end }}
50-
image: "{{ .Values.flytescheduler.image.repository }}:{{ .Values.flytescheduler.image.tag }}"
50+
image: "{{ tpl .Values.flytescheduler.image.repository . }}:{{ tpl .Values.flytescheduler.image.tag . }}"
5151
imagePullPolicy: "{{ .Values.flytescheduler.image.pullPolicy }}"
5252
name: flytescheduler-check
5353
securityContext:
@@ -74,7 +74,7 @@ spec:
7474
{{- toYaml . | nindent 8 }}
7575
{{- end }}
7676
{{- end }}
77-
image: "{{ .Values.flytescheduler.image.repository }}:{{ .Values.flytescheduler.image.tag }}"
77+
image: "{{ tpl .Values.flytescheduler.image.repository . }}:{{ tpl .Values.flytescheduler.image.tag . }}"
7878
imagePullPolicy: "{{ .Values.flytescheduler.image.pullPolicy }}"
7979
name: flytescheduler
8080
ports:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ spec:
8383
{{- toYaml . | nindent 8 }}
8484
{{- end }}
8585
{{- end }}
86-
image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
86+
image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
8787
imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
8888
{{- if .Values.flytepropeller.manager }}
8989
name: flytepropeller-manager

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ template:
3434
valueFrom:
3535
fieldRef:
3636
fieldPath: metadata.name
37-
image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
37+
image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
3838
imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
3939
name: {{ index .Values.configmap.core.manager "pod-template-container-name" }}
4040
ports:

‎charts/flyte-core/templates/propeller/webhook.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
labels:
4343
app: {{ template "flyte-pod-webhook.name" . }}
4444
app.kubernetes.io/name: {{ template "flyte-pod-webhook.name" . }}
45-
app.kubernetes.io/version: {{ .Values.flytepropeller.image.tag }}
45+
app.kubernetes.io/version: {{ tpl .Values.flytepropeller.image.tag . }}
4646
{{- with .Values.webhook.podLabels }}
4747
{{- toYaml . | nindent 8 }}
4848
{{- end }}
@@ -67,7 +67,7 @@ spec:
6767
{{- if .Values.webhook.enabled }}
6868
initContainers:
6969
- name: generate-secrets
70-
image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
70+
image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
7171
imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
7272
command:
7373
- flytepropeller
@@ -100,7 +100,7 @@ spec:
100100
{{- end }}
101101
containers:
102102
- name: webhook
103-
image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
103+
image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
104104
imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
105105
command:
106106
- flytepropeller

‎deployment/eks/flyte_aws_scheduler_helm_generated.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,7 @@ spec:
915915
capabilities:
916916
drop: ["ALL"]
917917
volumeMounts:
918+
918919
- mountPath: /etc/db
919920
name: db-pass
920921
- mountPath: /etc/flyte/config
@@ -936,6 +937,7 @@ spec:
936937
capabilities:
937938
drop: ["ALL"]
938939
volumeMounts:
940+
939941
- mountPath: /etc/db
940942
name: db-pass
941943
- mountPath: /etc/flyte/config
@@ -954,6 +956,7 @@ spec:
954956
capabilities:
955957
drop: ["ALL"]
956958
volumeMounts:
959+
957960
- mountPath: /etc/db
958961
name: db-pass
959962
- mountPath: /etc/flyte/clusterresource/templates
@@ -1020,6 +1023,7 @@ spec:
10201023
capabilities:
10211024
drop: ["ALL"]
10221025
volumeMounts:
1026+
10231027
- mountPath: /etc/db
10241028
name: db-pass
10251029
- mountPath: /srv/flyte
@@ -1030,6 +1034,7 @@ spec:
10301034
name: admin-secrets
10311035
serviceAccountName: flyteadmin
10321036
volumes:
1037+
10331038
- name: db-pass
10341039
secret:
10351040
secretName: db-pass
@@ -1103,6 +1108,7 @@ spec:
11031108
imagePullPolicy: "IfNotPresent"
11041109
name: sync-cluster-resources
11051110
volumeMounts:
1111+
11061112
- mountPath: /etc/db
11071113
name: db-pass
11081114
- mountPath: /etc/flyte/clusterresource/templates
@@ -1111,6 +1117,7 @@ spec:
11111117
name: config-volume
11121118
serviceAccountName: flyteadmin
11131119
volumes:
1120+
11141121
- name: db-pass
11151122
secret:
11161123
secretName: db-pass
@@ -1233,6 +1240,7 @@ spec:
12331240
imagePullPolicy: "IfNotPresent"
12341241
name: run-migrations
12351242
volumeMounts:
1243+
12361244
- mountPath: /etc/db
12371245
name: db-pass
12381246
- mountPath: /etc/datacatalog/config
@@ -1268,12 +1276,14 @@ spec:
12681276
ephemeral-storage: 200Mi
12691277
memory: 200Mi
12701278
volumeMounts:
1279+
12711280
- mountPath: /etc/db
12721281
name: db-pass
12731282
- mountPath: /etc/datacatalog/config
12741283
name: config-volume
12751284
serviceAccountName: datacatalog
12761285
volumes:
1286+
12771287
- name: db-pass
12781288
secret:
12791289
secretName: db-pass

‎deployment/eks/flyte_helm_controlplane_generated.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ spec:
612612
capabilities:
613613
drop: ["ALL"]
614614
volumeMounts:
615+
615616
- mountPath: /etc/db
616617
name: db-pass
617618
- mountPath: /etc/flyte/config
@@ -633,6 +634,7 @@ spec:
633634
capabilities:
634635
drop: ["ALL"]
635636
volumeMounts:
637+
636638
- mountPath: /etc/db
637639
name: db-pass
638640
- mountPath: /etc/flyte/config
@@ -651,6 +653,7 @@ spec:
651653
capabilities:
652654
drop: ["ALL"]
653655
volumeMounts:
656+
654657
- mountPath: /etc/db
655658
name: db-pass
656659
- mountPath: /etc/flyte/clusterresource/templates
@@ -717,6 +720,7 @@ spec:
717720
capabilities:
718721
drop: ["ALL"]
719722
volumeMounts:
723+
720724
- mountPath: /etc/db
721725
name: db-pass
722726
- mountPath: /srv/flyte
@@ -727,6 +731,7 @@ spec:
727731
name: admin-secrets
728732
serviceAccountName: flyteadmin
729733
volumes:
734+
730735
- name: db-pass
731736
secret:
732737
secretName: db-pass
@@ -800,6 +805,7 @@ spec:
800805
imagePullPolicy: "IfNotPresent"
801806
name: sync-cluster-resources
802807
volumeMounts:
808+
803809
- mountPath: /etc/db
804810
name: db-pass
805811
- mountPath: /etc/flyte/clusterresource/templates
@@ -808,6 +814,7 @@ spec:
808814
name: config-volume
809815
serviceAccountName: flyteadmin
810816
volumes:
817+
811818
- name: db-pass
812819
secret:
813820
secretName: db-pass
@@ -930,6 +937,7 @@ spec:
930937
imagePullPolicy: "IfNotPresent"
931938
name: run-migrations
932939
volumeMounts:
940+
933941
- mountPath: /etc/db
934942
name: db-pass
935943
- mountPath: /etc/datacatalog/config
@@ -965,12 +973,14 @@ spec:
965973
ephemeral-storage: 200Mi
966974
memory: 200Mi
967975
volumeMounts:
976+
968977
- mountPath: /etc/db
969978
name: db-pass
970979
- mountPath: /etc/datacatalog/config
971980
name: config-volume
972981
serviceAccountName: datacatalog
973982
volumes:
983+
974984
- name: db-pass
975985
secret:
976986
secretName: db-pass
@@ -1037,6 +1047,7 @@ spec:
10371047
capabilities:
10381048
drop: ["ALL"]
10391049
volumeMounts:
1050+
10401051
- mountPath: /etc/db
10411052
name: db-pass
10421053
- mountPath: /etc/flyte/config
@@ -1068,6 +1079,7 @@ spec:
10681079
ephemeral-storage: 50Mi
10691080
memory: 50Mi
10701081
volumeMounts:
1082+
10711083
- mountPath: /etc/db
10721084
name: db-pass
10731085
- mountPath: /etc/flyte/config
@@ -1076,6 +1088,7 @@ spec:
10761088
mountPath: /etc/secrets/
10771089
serviceAccountName: flytescheduler
10781090
volumes:
1091+
10791092
- name: db-pass
10801093
secret:
10811094
secretName: db-pass

0 commit comments

Comments
 (0)