From 8fb0e9e10c96cdf90c22bf36900d9444633b1e9a Mon Sep 17 00:00:00 2001 From: parauliya <30143812+parauliya@users.noreply.github.com> Date: Tue, 13 Aug 2019 11:52:23 +0530 Subject: [PATCH] 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-all/templates/_helpers.tpl | 10 ++++++++++ charts/fission-all/templates/deployment.yaml | 16 ++++++++-------- charts/fission-all/templates/fluentbit.yaml | 8 ++++++++ charts/fission-all/values.yaml | 1 + charts/fission-core/templates/_helpers.tpl | 11 +++++++++++ charts/fission-core/templates/deployment.yaml | 14 +++++++------- charts/fission-core/values.yaml | 1 + 7 files changed, 46 insertions(+), 15 deletions(-) diff --git a/charts/fission-all/templates/_helpers.tpl b/charts/fission-all/templates/_helpers.tpl index b434342d..f5834fae 100644 --- a/charts/fission-all/templates/_helpers.tpl +++ b/charts/fission-all/templates/_helpers.tpl @@ -31,3 +31,13 @@ canary: {{- 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 -}} diff --git a/charts/fission-all/templates/deployment.yaml b/charts/fission-all/templates/deployment.yaml index 3db0a7c2..7edd6992 100644 --- a/charts/fission-all/templates/deployment.yaml +++ b/charts/fission-all/templates/deployment.yaml @@ -128,7 +128,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 }}"] @@ -351,7 +351,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 }}"] @@ -399,7 +399,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 }}"] @@ -523,7 +523,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 }}"] @@ -628,7 +628,7 @@ spec: spec: containers: - name: mqtrigger - image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" + image: {{ include "fission-bundleImage" . | quote }} imagePullPolicy: {{ .Values.pullPolicy }} command: ["/fission-bundle"] args: ["--mqt", "--routerUrl", "http://router.{{ .Release.Namespace }}", "--collectorEndpoint", "{{ .Values.traceCollectorEndpoint }}"] @@ -744,7 +744,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 }}"] diff --git a/charts/fission-all/templates/fluentbit.yaml b/charts/fission-all/templates/fluentbit.yaml index b9dde729..1249af06 100644 --- a/charts/fission-all/templates/fluentbit.yaml +++ b/charts/fission-all/templates/fluentbit.yaml @@ -43,7 +43,11 @@ spec: readOnly: false containers: - name: logger +{{ if .Values.repository }} image: "{{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}" +{{ else }} + image: "{{ .Values.image }}:{{ .Values.imageTag }}" +{{ end }} imagePullPolicy: {{ .Values.pullPolicy }} env: - name: NODE_NAME @@ -61,7 +65,11 @@ spec: mountPath: /var/lib/docker/containers readOnly: true - name: fluentbit +{{- if .Values.repository }} image: "{{ .Values.logger.fluentdImageRepository }}/{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}" +{{ else }} + image: "{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}" +{{- end }} imagePullPolicy: {{ .Values.pullPolicy }} # CMD ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluent-bit.conf"] command: ["/fluent-bit/bin/fluent-bit", "-c", "/fluent-bit/etc/fluentbit.conf"] diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml index 7140455f..6ccdfb62 100644 --- a/charts/fission-all/values.yaml +++ b/charts/fission-all/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 diff --git a/charts/fission-core/templates/_helpers.tpl b/charts/fission-core/templates/_helpers.tpl index 77ecc824..df5a27ee 100644 --- a/charts/fission-core/templates/_helpers.tpl +++ b/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 -}} diff --git a/charts/fission-core/templates/deployment.yaml b/charts/fission-core/templates/deployment.yaml index 485950dd..6a24c73a 100644 --- a/charts/fission-core/templates/deployment.yaml +++ b/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 }}"] diff --git a/charts/fission-core/values.yaml b/charts/fission-core/values.yaml index 27a09b58..f9a34a3a 100644 --- a/charts/fission-core/values.yaml +++ b/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