respect templatized repository and image tags

Signed-off-by: Michael Hotan <[email protected]>

Author: mhotan

charts/flyte-core/templates/_helpers.tpl

@@ -176,7 +176,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 
 {{- define "databaseSecret.volume" -}}
 {{- $secretName := tpl (.Values.common.databaseSecret.name | default "") . -}}
-{{- if $secretName }}
+{{- if $secretName -}}
 - name: {{ $secretName }}
   secret:
     secretName: {{ $secretName }}
@@ -185,7 +185,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 
 {{- define "databaseSecret.volumeMount" -}}
 {{- $secretName := tpl (.Values.common.databaseSecret.name | default "") . -}}
-{{- if $secretName }}
+{{- if $secretName -}}
 - mountPath: /etc/db
   name: {{ $secretName }}
 {{- end }}

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

@@ -42,7 +42,7 @@ spec:
           - {{ .Values.flyteadmin.configPath }}
           - migrate
           - run
-          image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
+          image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
           imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
           name: run-migrations
           securityContext:
@@ -74,7 +74,7 @@ spec:
           {{- range .Values.flyteadmin.initialProjects }}
           - {{ . }}
           {{- end }}
-          image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
+          image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
           imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
           name: seed-projects
           securityContext:
@@ -98,7 +98,7 @@ spec:
           - {{ .Values.flyteadmin.configPath }}
           - clusterresource
           - sync
-          image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
+          image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
           imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
           name: sync-cluster-resources
           securityContext:
@@ -125,7 +125,7 @@ spec:
             {{- end }}
         {{- end }}
         - name: generate-secrets
-          image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
+          image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
           imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
           command: ["/bin/sh", "-c"]
           args:
@@ -164,7 +164,7 @@ spec:
         {{- tpl (toYaml .) $ | nindent 8 }}
         {{- end }}
         {{- end }}
-        image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
+        image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
         imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
         name: flyteadmin
         ports:

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

@@ -45,7 +45,7 @@ spec:
             {{- toYaml . | nindent 10 }}
             {{- end }}
           {{- end }}
-          image: "{{ .Values.flyteadmin.image.repository }}:{{ .Values.flyteadmin.image.tag }}"
+          image: "{{ tpl .Values.flyteadmin.image.repository . }}:{{ tpl .Values.flyteadmin.image.tag . }}"
           imagePullPolicy: "{{ .Values.flyteadmin.image.pullPolicy }}"
           name: sync-cluster-resources
           {{- with .Values.cluster_resource_manager.resources }}

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

@@ -40,7 +40,7 @@ spec:
       priorityClassName: {{ .Values.flyteconsole.priorityClassName }}
       {{- end }}
       containers:
-      - image: "{{ .Values.flyteconsole.image.repository }}:{{ .Values.flyteconsole.image.tag }}"
+      - image: "{{ tpl .Values.flyteconsole.image.repository . }}:{{ tpl .Values.flyteconsole.image.tag . }}"
         imagePullPolicy: "{{ .Values.flyteconsole.image.pullPolicy }}"
         name: flyteconsole
         envFrom:

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

@@ -42,7 +42,7 @@ spec:
         - {{ .Values.datacatalog.configPath }}
         - migrate
         - run
-        image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
+        image: "{{ tpl .Values.datacatalog.image.repository . }}:{{ tpl .Values.datacatalog.image.tag . }}"
         imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
         name: run-migrations
         volumeMounts: {{- include "databaseSecret.volumeMount" . | nindent 8 }}
@@ -73,7 +73,7 @@ spec:
           {{- toYaml . | nindent 8 }}
           {{- end }}
         {{- end }}
-        image: "{{ .Values.datacatalog.image.repository }}:{{ .Values.datacatalog.image.tag }}"
+        image: "{{ tpl .Values.datacatalog.image.repository . }}:{{ tpl .Values.datacatalog.image.tag . }}"
         imagePullPolicy: "{{ .Values.datacatalog.image.pullPolicy }}"
         name: datacatalog
         ports:

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

@@ -47,7 +47,7 @@ spec:
           {{- toYaml . | nindent 8 }}
           {{- end }}
         {{- end }}
-        image: "{{ .Values.flytescheduler.image.repository }}:{{ .Values.flytescheduler.image.tag }}"
+        image: "{{ tpl .Values.flytescheduler.image.repository . }}:{{ tpl .Values.flytescheduler.image.tag . }}"
         imagePullPolicy: "{{ .Values.flytescheduler.image.pullPolicy }}"
         name: flytescheduler-check
         securityContext:
@@ -74,7 +74,7 @@ spec:
           {{- toYaml . | nindent 8 }}
           {{- end }}
         {{- end }}
-        image: "{{ .Values.flytescheduler.image.repository }}:{{ .Values.flytescheduler.image.tag }}"
+        image: "{{ tpl .Values.flytescheduler.image.repository . }}:{{ tpl .Values.flytescheduler.image.tag . }}"
         imagePullPolicy: "{{ .Values.flytescheduler.image.pullPolicy }}"
         name: flytescheduler
         ports:

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

@@ -83,7 +83,7 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
         {{- end }}
-        image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
+        image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
         imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
         {{- if .Values.flytepropeller.manager }}
         name: flytepropeller-manager

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

@@ -34,7 +34,7 @@ template:
         valueFrom:
           fieldRef:
             fieldPath: metadata.name
-      image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
+      image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
       imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
       name: {{ index .Values.configmap.core.manager "pod-template-container-name" }}
       ports:

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

@@ -42,7 +42,7 @@ spec:
       labels:
         app: {{ template "flyte-pod-webhook.name" . }}
         app.kubernetes.io/name: {{ template "flyte-pod-webhook.name" . }}
-        app.kubernetes.io/version: {{ .Values.flytepropeller.image.tag }}
+        app.kubernetes.io/version: {{ tpl .Values.flytepropeller.image.tag . }}
         {{- with .Values.webhook.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -67,7 +67,7 @@ spec:
 {{- if .Values.webhook.enabled }}
       initContainers:
       - name: generate-secrets
-        image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
+        image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
         imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
         command:
           - flytepropeller
@@ -100,7 +100,7 @@ spec:
 {{- end }}
       containers:
         - name: webhook
-          image: "{{ .Values.flytepropeller.image.repository }}:{{ .Values.flytepropeller.image.tag }}"
+          image: "{{ tpl .Values.flytepropeller.image.repository . }}:{{ tpl .Values.flytepropeller.image.tag . }}"
           imagePullPolicy: "{{ .Values.flytepropeller.image.pullPolicy }}"
           command:
             - flytepropeller

deployment/sandbox/flyte_helm_generated.yaml

@@ -710,6 +710,7 @@ data:
   resource_manager.yaml: | 
     propeller:
       resourcemanager:
+        redis: null
         type: noop
   storage.yaml: | 
     storage:
@@ -7222,7 +7223,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "671959f1f31dcfd1a93c1a484be7c7264f05b66de43df1a770f331d389787a4"
+        configChecksum: "ea603a73ffb9754ac5c6d9bab9a8e868050e0e7b118399be9c8b1cd4ce86cf1"
         prometheus.io/path: "/metrics"
         prometheus.io/port: "10254"
       labels: 
@@ -7300,7 +7301,7 @@ spec:
         app.kubernetes.io/name: flyte-pod-webhook
         app.kubernetes.io/version: v1.16.0
       annotations:
-        configChecksum: "671959f1f31dcfd1a93c1a484be7c7264f05b66de43df1a770f331d389787a4"
+        configChecksum: "ea603a73ffb9754ac5c6d9bab9a8e868050e0e7b118399be9c8b1cd4ce86cf1"
         prometheus.io/path: "/metrics"
         prometheus.io/port: "10254"
     spec: