Skaffold kind (#1700)

charts/fission-all/templates/_helpers.tpl

@@ -38,8 +38,16 @@ This template generates the image name for the deployment depending on the value
 */}}
 {{- define "fission-bundleImage" -}}
 {{- if .Values.repository -}}
+  {{- if eq .Values.imageTag "" -}}
+    {{ .Values.repository }}/{{ .Values.image }}
+  {{- else -}}
     {{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}
+  {{- end }}
 {{- else -}}
-    {{ .Values.image }}:{{ .Values.imageTag }}    
+  {{- if eq .Values.imageTag "" -}}
+    {{ .Values.image }}
+  {{- else -}}
+    {{ .Values.image }}:{{ .Values.imageTag }}
+  {{- end }}
 {{- end }}
 {{- end -}}

charts/fission-all/templates/deployment.yaml

@@ -210,7 +210,11 @@ spec:
         args: ["--executorPort", "8888", "--namespace", "{{ .Values.functionNamespace }}"]
         env:
         - name: FETCHER_IMAGE
+        {{- if eq .Values.fetcher.imageTag "" }}
+          value: "{{ .Values.fetcher.image }}"
+        {{- else }}
           value: "{{ .Values.fetcher.image }}:{{ .Values.fetcher.imageTag }}"
+        {{- end }}
         - name: FETCHER_IMAGE_PULL_POLICY
           value: "{{ .Values.pullPolicy }}"
         - name: RUNTIME_IMAGE_PULL_POLICY
@@ -282,7 +286,11 @@ spec:
         args: ["--builderMgr", "--storageSvcUrl", "http://storagesvc.{{ .Release.Namespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]
         env:
         - name: FETCHER_IMAGE
+        {{- if eq .Values.fetcher.imageTag "" }}
+          value: "{{ .Values.fetcher.image }}"
+        {{- else }}
           value: "{{ .Values.fetcher.image }}:{{ .Values.fetcher.imageTag }}"
+        {{- end }}
         - name: FETCHER_IMAGE_PULL_POLICY
           value: "{{ .Values.pullPolicy }}"
         - name: BUILDER_IMAGE_PULL_POLICY
@@ -642,7 +650,11 @@ spec:
     spec:
       containers:
       - name: mqtrigger
+      {{- if eq .Values.imageTag "" }}
+        image: "{{ .Values.image }}"
+      {{- else }}
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+      {{- end }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"]
@@ -732,7 +744,11 @@ spec:
     spec:
       containers:
       - name: mqtrigger
+      {{- if eq .Values.imageTag "" }}
+        image: "{{ .Values.image }}"
+      {{- else }}
         image: "{{ .Values.image }}:{{ .Values.imageTag }}"
+      {{- end }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}"]

charts/fission-all/templates/fluentbit.yaml

@@ -109,11 +109,7 @@ spec:
 {{- end }}
       containers:
         - name: logger
-{{ if .Values.repository }}
-          image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
-{{ else }}
-          image: "{{ .Values.image }}:{{ .Values.imageTag }}"
-{{ end }}
+          image: {{ include "fission-bundleImage" . | quote }}
           imagePullPolicy: {{ .Values.pullPolicy }}
           env:
             - name: NODE_NAME

charts/fission-all/templates/pre-upgrade-job.yaml

@@ -26,7 +26,11 @@ spec:
       restartPolicy: Never
       containers:
       - name: pre-upgrade-job
+      {{- if .Values.imageTag }}
         image: {{ .Values.preUpgradeChecksImage }}:{{ .Values.imageTag }}
+      {{- else }}
+        image: {{ .Values.preUpgradeChecksImage }}
+      {{- end }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: [ "/pre-upgrade-checks" ]
         args: ["--fn-pod-namespace", "{{ .Values.functionNamespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]