Merge pull request #243 from Gentleelephant/release-2.5-229

update imageRegistry
kubesphere · Feb 29, 2024 · 4e93081 · 4e93081
2 parents e2801d1 + a6a143c
commit 4e93081
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -6,3 +6,22 @@
     {{- .Release.Namespace -}}
   {{- end -}}
 {{- end -}}
+
+
+{{- define "global.imageRegistry" -}}
+{{- $registry := default .Values.global.imageRegistry .Values.imageRegistryOverride }}
+  {{- if $registry -}}
+    {{- printf "%s/" $registry -}}
+  {{- end -}}
+{{- end -}}
+
+
+{{- define "common.notificationmanager.nodeSelectors" -}}
+{{- $selector := default .Values.global.nodeSelector .Values.notificationmanager.nodeSelector }}
+{{- toYaml $selector | nindent 4 }}
+{{- end -}}
+
+{{- define "common.operator.nodeSelectors" -}}
+{{- $selector := default .Values.global.nodeSelector .Values.operator.nodeSelector }}
+{{- toYaml $selector | nindent 8 }}
+{{- end -}}
diff --git a/helm/templates/notificationmanagers.yaml b/helm/templates/notificationmanagers.yaml
@@ -8,12 +8,12 @@ spec:
   {{- if .Values.notificationmanager.replicas }}
   replicas: {{ .Values.notificationmanager.replicas }}
   {{- end}}
-  image: {{ .Values.notificationmanager.image.repo }}:{{ .Values.notificationmanager.image.tag }}
+  image: {{ include "global.imageRegistry" .}}{{ .Values.notificationmanager.image.repo }}:{{ .Values.notificationmanager.image.tag }}
   imagePullPolicy: {{ .Values.notificationmanager.image.pullPolicy }}
   serviceAccountName: notification-manager-sa
   portName: webhook
-  nodeSelector: 
-    {{- toYaml .Values.notificationmanager.nodeSelector | nindent 4 }}
+  nodeSelector:
+    {{- include "common.notificationmanager.nodeSelectors" . }}
   affinity: 
     {{- toYaml .Values.notificationmanager.affinity | nindent 4 }}
   tolerations: 
@@ -41,7 +41,7 @@ spec:
   {{- if .Values.kubesphere.image }}
       image: {{ .Values.kubesphere.image }}
   {{- else }}
-      image: kubesphere/notification-tenant-sidecar:{{ .Values.kubesphere.version }}
+      image: {{ include "global.imageRegistry" . }}{{ .Values.notificationmanager.sidecar.image.repo }}:{{ .Values.kubesphere.version }}
   {{- end }}
       name: tenant
       type: kubesphere

diff --git a/helm/templates/operator.yaml b/helm/templates/operator.yaml
@@ -21,7 +21,7 @@ spec:
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
         - --v=10
-        image: {{ .Values.operator.containers.proxy.image.repo }}:{{ .Values.operator.containers.proxy.image.tag }}
+        image: {{ include "global.imageRegistry" . }}{{ .Values.operator.containers.proxy.image.repo }}:{{ .Values.operator.containers.proxy.image.tag }}
         imagePullPolicy: {{ .Values.operator.containers.proxy.image.pullPolicy }}
         name: kube-rbac-proxy
         ports:
@@ -47,7 +47,7 @@ spec:
         - name: TZ
           value: {{ .Values.timezone }}
         {{- end }}
-        image: {{ .Values.operator.containers.operator.image.repo }}:{{ .Values.operator.containers.operator.image.tag }}
+        image: {{ include "global.imageRegistry" . }}{{ .Values.operator.containers.operator.image.repo }}:{{ .Values.operator.containers.operator.image.tag }}
         imagePullPolicy: {{ .Values.operator.containers.operator.image.pullPolicy }}
         name: notification-manager-operator
         ports:
@@ -68,7 +68,7 @@ spec:
       serviceAccount: notification-manager-sa
       serviceAccountName: notification-manager-sa
       nodeSelector:
-      {{- toYaml .Values.operator.nodeSelector | nindent 8 }}
+      {{- include "common.operator.nodeSelectors" . }}
       affinity:
       {{- toYaml .Values.operator.affinity | nindent 8 }}
       tolerations:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -5,6 +5,10 @@ kubesphere:
   # supported version: v3.1.0, v3.2.0
   version: v3.2.0
 
+global:
+  imageRegistry: ""
+  nodeSelector: {}
+imageRegistryOverride: ""
 # value of notification-manager-operator
 operator: 
   containers:
@@ -52,6 +56,9 @@ notificationmanager:
     repo: kubesphere/notification-manager
     tag: v2.5.0-rc.1
     pullPolicy: IfNotPresent
+  sidecar:
+    image:
+      repo: kubesphere/notification-tenant-sidecar
   replicas: 1
   resources:
     limits: