Skip to content

Commit bd5a9b2

Browse files
fix: update image tag handling to default to chart app version (kubesphere#300)
Signed-off-by: Gentleelephant <1132960613@qq.com>
1 parent 87c219a commit bd5a9b2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

helm/templates/notificationmanagers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
{{- if .Values.notificationmanager.replicas }}
99
replicas: {{ .Values.notificationmanager.replicas }}
1010
{{- end}}
11-
image: {{ include "global.imageRegistry" .}}{{ .Values.notificationmanager.image.repo }}:{{ .Values.notificationmanager.image.tag }}
11+
image: {{ include "global.imageRegistry" .}}{{ .Values.notificationmanager.image.repo }}:{{ .Values.notificationmanager.image.tag | default (printf "v%s" .Chart.AppVersion) }}
1212
imagePullPolicy: {{ .Values.notificationmanager.image.pullPolicy }}
1313
serviceAccountName: notification-manager-sa
1414
portName: webhook

helm/templates/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
- name: TZ
4848
value: {{ .Values.timezone }}
4949
{{- end }}
50-
image: {{ include "global.imageRegistry" . }}{{ .Values.operator.containers.operator.image.repo }}:{{ .Values.operator.containers.operator.image.tag }}
50+
image: {{ include "global.imageRegistry" . }}{{ .Values.operator.containers.operator.image.repo }}:{{ .Values.operator.containers.operator.image.tag | default (printf "v%s" .Chart.AppVersion) }}
5151
imagePullPolicy: {{ .Values.operator.containers.operator.image.pullPolicy }}
5252
name: notification-manager-operator
5353
ports:

helm/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ operator:
2727
operator:
2828
image:
2929
repo: kubesphere/notification-manager-operator
30-
tag: v2.6.0
30+
# tag: v2.6.0
3131
pullPolicy: IfNotPresent
3232
resources:
3333
limits:
@@ -45,7 +45,7 @@ operator:
4545
notificationmanager:
4646
image:
4747
repo: kubesphere/notification-manager
48-
tag: v2.6.0
48+
# tag: v2.6.0
4949
pullPolicy: IfNotPresent
5050
sidecar:
5151
image:

0 commit comments

Comments
 (0)