Allow empty repository tag in chart values.yaml (#1259)

This fix allows the empty repository tag in values.yaml file. The changes are done in the templates of deployment and fluentbit where repository tag will be added in the docker image name only when specified with some value in case of empty repository tag image name contain the name of image and tag only.

charts/fission-core/templates/_helpers.tpl

@@ -29,3 +29,14 @@ canary:
   {{- end }}
   {{- printf "\n" -}}
 {{- end -}}
+
+{{/*
+This template generates the image name for the deployment depending on the value of "repository" field in values.yaml file.
+*/}}
+{{- define "fission-bundleImage" -}}
+{{- if .Values.repository -}}
+    {{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}
+{{- else -}}
+    {{ .Values.image }}:{{ .Values.imageTag }}    
+{{- end }}
+{{- end -}}

charts/fission-core/templates/deployment.yaml

@@ -129,7 +129,7 @@ spec:
     spec:
       containers:
       - name: controller
-        image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
+        image: {{ include "fission-bundleImage" . | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--controllerPort", "8888", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"]
@@ -192,7 +192,7 @@ spec:
     spec:
       containers:
       - name: router
-        image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
+        image: {{ include "fission-bundleImage" . | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--routerPort", "8888", "--executorUrl", "http://executor.{{ .Release.Namespace }}", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"]
@@ -285,7 +285,7 @@ spec:
     spec:
       containers:
       - name: executor
-        image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
+        image: {{ include "fission-bundleImage" . | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--executorPort", "8888", "--namespace", "{{ .Values.functionNamespace }}", "--fission-namespace", "{{ .Release.Namespace }}", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"]
@@ -347,7 +347,7 @@ spec:
     spec:
       containers:
       - name: buildermgr
-        image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
+        image: {{ include "fission-bundleImage" . | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--builderMgr", "--storageSvcUrl", "http://storagesvc.{{ .Release.Namespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"]
@@ -393,7 +393,7 @@ spec:
     spec:
       containers:
       - name: kubewatcher
-        image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
+        image: {{ include "fission-bundleImage" . | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--kubewatcher", "--routerUrl", "http://router.{{ .Release.Namespace }}", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"]
@@ -421,7 +421,7 @@ spec:
     spec:
       containers:
       - name: timer
-        image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
+        image: {{ include "fission-bundleImage" . | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--timer", "--routerUrl", "http://router.{{ .Release.Namespace }}", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"]
@@ -450,7 +450,7 @@ spec:
     spec:
       containers:
       - name: storagesvc
-        image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}"
+        image: {{ include "fission-bundleImage" . | quote }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: ["/fission-bundle"]
         args: ["--storageServicePort", "8000", "--filePath", "/fission", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"]

charts/fission-core/values.yaml

@@ -10,6 +10,7 @@ serviceType: ClusterIP
 routerServiceType: LoadBalancer
 
 ## Image base repository
+## Leave it empty for using existing local image
 repository: index.docker.io
 
 ## Fission image repository