Use GHCR repo for fetcher image by default (#3145)

* Use GHCR repo for fetcher image by default

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Fix help template

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Fix all templates used

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

---------

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

charts/fission-all/templates/_helpers.tpl

@@ -37,38 +37,37 @@ auth:
 {{- end -}}
 
 {{/*
-This template generates the image name for the deployment depending on the value of "repository" field in values.yaml file.
+Helper template to construct image names with repository and tag
 */}}
-{{- define "fission-bundleImage" -}}
+{{- define "imageWithTag" -}}
-{{- if .Values.repository -}}
+{{- $repository := index . 0 -}}
-  {{- if eq .Values.imageTag "" -}}
+{{- $image := index . 1 -}}
-    {{ .Values.repository }}/{{ .Values.image }}
+{{- $tag := index . 2 -}}
-  {{- else -}}
+{{- if $repository -}}
-    {{ .Values.repository }}/{{ .Values.image }}:{{ .Values.imageTag }}
+{{- printf "%s/%s%s" $repository $image (ne $tag "" | ternary (printf ":%s" $tag) "") -}}
-  {{- end }}
 {{- else -}}
-  {{- if eq .Values.imageTag "" -}}
+{{- printf "%s%s" $image (ne $tag "" | ternary (printf ":%s" $tag) "") -}}
-    {{ .Values.image }}
+{{- end -}}
-  {{- else -}}
+{{- end -}}
-    {{ .Values.image }}:{{ .Values.imageTag }}
+
-  {{- end }}
+{{- define "fission-bundleImage" -}}
-{{- end }}
+{{- $args := list .Values.repository .Values.image .Values.imageTag -}}
+{{- include "imageWithTag" $args -}}
 {{- end -}}
 
 {{- define "reporterImage" -}}
-{{- if .Values.repository -}}
+{{- $args := list .Values.repository .Values.postInstallReportImage .Values.imageTag -}}
-  {{- if eq .Values.imageTag "" -}}
+{{- include "imageWithTag" $args -}}
-    {{ .Values.repository }}/{{ .Values.postInstallReportImage }}
+{{- end -}}
-  {{- else -}}
+
-    {{ .Values.repository }}/{{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+{{- define "fetcherImage" -}}
-  {{- end }}
+{{- $args := list (.Values.fetcher.repository | default .Values.repository) .Values.fetcher.image .Values.fetcher.imageTag -}}
-{{- else -}}
+{{- include "imageWithTag" $args -}}
-  {{- if eq .Values.imageTag "" -}}
+{{- end -}}
-    {{ .Values.postInstallReportImage }}
+
-  {{- else -}}
+{{- define "preUpgradeChecksImage" -}}
-    {{ .Values.postInstallReportImage }}:{{ .Values.imageTag }}
+{{- $args := list (.Values.preUpgradeChecks.repository | default .Values.repository) .Values.preUpgradeChecks.image .Values.preUpgradeChecks.imageTag -}}
-  {{- end }}
+{{- include "imageWithTag" $args -}}
-{{- end }}
 {{- end -}}
 
 {{- define "opentelemtry.envs" }}

charts/fission-all/templates/buildermgr/deployment.yaml

@@ -30,11 +30,7 @@ spec:
         args: ["--builderMgr", "--storageSvcUrl", "http://storagesvc.{{ .Release.Namespace }}"]
         env:
         - name: FETCHER_IMAGE
-        {{- if eq .Values.fetcher.imageTag "" }}
+          value: {{ include "fetcherImage" . | quote }}
-          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

charts/fission-all/templates/executor/deployment.yaml

@@ -30,11 +30,7 @@ spec:
         args: ["--executorPort", "8888"]
         env:
         - name: FETCHER_IMAGE
-        {{- if eq .Values.fetcher.imageTag "" }}
+          value: {{ include "fetcherImage" . | quote }}
-          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

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

@@ -28,11 +28,7 @@ spec:
       restartPolicy: Never
       containers:
       - name: pre-upgrade-job
-      {{- if .Values.preUpgradeChecks.imageTag }}
+        image: {{ include "preUpgradeChecksImage" . | quote }}
-        image: {{ .Values.preUpgradeChecks.image }}:{{ .Values.preUpgradeChecks.imageTag }}
-      {{- else }}
-        image: {{ .Values.preUpgradeChecks.image }}
-      {{- end }}
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: [ "/pre-upgrade-checks" ]
         env:

charts/fission-all/values.yaml

@@ -117,6 +117,10 @@ kubernetesClientBurst: 500
 ## fetcher helps in fetching function source code/build and uploading it when function is invoked.
 ##
 fetcher:
+  ## repository represents the repository of the fetcher component.
+  ##
+  ## By default, it is empty, which means global repository will be used.
+  repository: ""
   ## image represents the image of the fetcher component.
   image: fission/fetcher
   ## imageTag represents the tag of the image of the fetcher component.
@@ -683,6 +687,10 @@ preUpgradeChecks:
   ## Run pre-install/pre-upgrade checks if true
   ##
   enabled: true
+  ## Repository for pre-install/pre-upgrade checks image
+  ## By default it uses the global repository
+  ##
+  repository: ""
   ## pre-install/pre-upgrade checks live in this image
   ##
   image: fission/pre-upgrade-checks

pkg/fetcher/config/config.go

@@ -69,7 +69,7 @@ func MakeFetcherConfig(sharedMountPath string) (*Config, error) {
 
 	fetcherImage := os.Getenv("FETCHER_IMAGE")
 	if len(fetcherImage) == 0 {
-		fetcherImage = "fission/fetcher"
+		fetcherImage = "ghcr.io/fission/fetcher"
 	}
 
 	fetcherImagePullPolicy := os.Getenv("FETCHER_IMAGE_PULL_POLICY")