Merge pull request #6 from BaizeAI/feature/global-imageRegistry

+ add support for global.imageRegistry
BaizeAI · Sep 23, 2024 · ad81360 · ad81360
2 parents 868944f + cbf41a6
commit ad81360
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/manifests/kcover/templates/_common.tpl b/manifests/kcover/templates/_common.tpl
@@ -0,0 +1,21 @@
+{{- define "common.images.image" -}}
+{{- $registryName := .imageRoot.registry -}}
+{{- $repositoryName := .imageRoot.repository -}}
+{{- $tag := .defaultTag  -}}
+{{- if .global }}
+    {{- if .global.imageRegistry }}
+     {{- $registryName = .global.imageRegistry -}}
+    {{- end -}}
+{{- end -}}
+{{- if .imageRoot.registry }}
+    {{- $registryName = .imageRoot.registry  -}}
+{{- end -}}
+{{- if .imageRoot.tag }}
+    {{- $tag = .imageRoot.tag  -}}
+{{- end -}}
+{{- if $registryName }}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- else -}}
+{{- printf "%s:%s" $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
diff --git a/manifests/kcover/templates/_helpers.tpl b/manifests/kcover/templates/_helpers.tpl
@@ -60,3 +60,11 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{- define "controller.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.controller.image "global" .Values.global "defaultTag" .Chart.Version) }}
+{{- end -}}
+
+{{- define "agent.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.agent.image "global" .Values.global "defaultTag" .Chart.Version) }}
+{{- end -}}
diff --git a/manifests/kcover/templates/daemonset.yaml b/manifests/kcover/templates/daemonset.yaml
@@ -29,7 +29,7 @@ spec:
         - name: agent
           securityContext:
             {{- toYaml .Values.agent.securityContext | nindent 12 }}
-          image: "{{ .Values.agent.image.registry }}/{{ .Values.agent.image.repository }}:{{ .Values.agent.image.tag | default .Chart.AppVersion }}"
+          image: {{ template "agent.image" . }}
           imagePullPolicy: {{ .Values.agent.image.pullPolicy }}
           env:
             - name: FAST_RECOVERY_NODE_NAME

diff --git a/manifests/kcover/templates/deployment.yaml b/manifests/kcover/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
         {{- toYaml .Values.controller.podSecurityContext | nindent 8 }}
       containers:
         - name: controller-container
-          image: "{{ .Values.controller.image.registry }}/{{ .Values.controller.image.repository }}:{{ .Values.controller.image.tag | default .Chart.AppVersion }}"
+          image: {{ template "controller.image" . }}
           imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
           env:
             - name: FAST_RECOVERY_NODE_NAME

diff --git a/manifests/kcover/values.yaml b/manifests/kcover/values.yaml
@@ -16,9 +16,12 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
+global:
+  imageRegistry: ghcr.io
+
 agent:
   image:
-    registry: ghcr.io
+    registry: ''
     repository: baizeai/kcover-agent
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
@@ -76,7 +79,7 @@ agent:
 
 controller:
   image:
-    registry: ghcr.io
+    registry: ''
     repository: baizeai/kcover-controller
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.