Skip to content

Commit 595f000

Browse files
wangyeleiwangyelei
authored
chore: The backup and parameter images version should be consistent with the main Redis container. (#2449)
1 parent 8e5665b commit 595f000

File tree

7 files changed

+52
-32
lines changed

7 files changed

+52
-32
lines changed

‎addons/redis/templates/_helpers.tpl‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,19 @@ redis-cluster-scripts-template-{{ .Chart.Version }}
143143

144144
{{- define "busybox.image" -}}
145145
{{ .Values.busyboxImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.busyboxImage.repository}}:{{ .Values.busyboxImage.tag }}
146-
{{- end }}}
146+
{{- end }}
147147

148148
{{- define "metrics.repository" -}}
149149
{{ .Values.metrics.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.metrics.image.repository}}
150-
{{- end }}}
150+
{{- end }}
151151

152152
{{- define "metrics.image" -}}
153153
{{ .Values.metrics.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.metrics.image.repository}}:{{ .Values.metrics.image.tag }}
154-
{{- end }}}
154+
{{- end }}
155155

156156
{{- define "apeDts.image" -}}
157157
{{ .Values.apeDtsImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.apeDtsImage.repository}}:{{ .Values.apeDtsImage.tag }}
158-
{{- end }}}
158+
{{- end }}
159159

160160
{{/*
161161
Generate scripts configmap
@@ -183,4 +183,13 @@ redis-account.sh: |-
183183

184184
{{- define "apeDts.reshard.image" -}}
185185
{{ .Values.image.apeDts.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.image.apeDts.repository}}:{{ .Values.image.apeDts.reshardTag }}
186-
{{- end }}}
186+
{{- end }}
187+
188+
{{- define "redis.ceRepository" -}}
189+
{{ $registry := .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" )}}
190+
{{- if eq $registry "docker.io" -}}
191+
{{- .Values.ceImage.repository -}}
192+
{{- else -}}
193+
apecloud/redis
194+
{{- end -}}
195+
{{- end -}}

‎addons/redis/templates/backuppolicytemplate.yaml‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,18 @@ spec:
4343
- name: IMAGE
4444
valueFrom:
4545
versionMapping:
46-
- serviceVersions:
47-
- "6.2.18"
48-
mappedValue: "{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:6.2.6-v19"
49-
- serviceVersions:
50-
- "7.4.5"
51-
- "7.4.6"
52-
- "7.4.7"
53-
mappedValue: "{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:7.4.0-v8"
54-
- serviceVersions:
55-
- "8.0.1"
56-
- "8.0.2"
57-
- "8.0.3"
58-
- "8.0.4"
59-
- "8.0.5"
60-
mappedValue: "{{ .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.ceImage.repository }}:8.0.5"
61-
- serviceVersions:
62-
- "8.2.1"
63-
- "8.2.3"
64-
mappedValue: "{{ .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.ceImage.repository }}:8.2.3"
65-
- serviceVersions:
66-
- "8.4.0"
67-
mappedValue: "{{ .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.ceImage.repository }}:8.4.0"
46+
{{- $redisCeRepo := include "redis.ceRepository" . -}}
47+
{{- range .Values.redisVersions }}
48+
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
49+
{{- if or (eq .major "8") (eq .major "5") }}
50+
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
51+
{{- end }}
52+
{{- range .mirrorVersions }}
53+
- serviceVersions:
54+
- {{ .version }}
55+
mappedValue: {{ $redisRepository }}:{{ .imageTag }}
56+
{{- end }}
57+
{{- end }}
6858
- name: volume-snapshot
6959
snapshotVolumes: true
7060
targetVolumes:

‎addons/redis/templates/cmpv-redis-cluster.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
releases:
20+
{{- $redisCeRepo := include "redis.ceRepository" . -}}
2021
{{- range .Values.redisVersions }}
2122
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
2223
{{- if or (eq .major "8") (eq .major "5") }}
23-
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository }}
24+
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" )) $redisCeRepo }}
2425
{{- end }}
2526
{{- range .mirrorVersions }}
2627
- name: {{ .version }}

‎addons/redis/templates/cmpv-redis-sentinel.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
releases:
20+
{{- $redisCeRepo := include "redis.ceRepository" . }}
2021
{{- range .Values.redisVersions }}
2122
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
2223
{{- if or (eq .major "8") (eq .major "5") }}
23-
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository }}
24+
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
2425
{{- end }}
2526
{{- range .mirrorVersions }}
2627
- name: {{ .version }}

‎addons/redis/templates/cmpv-redis.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
releases:
20+
{{- $redisCeRepo := include "redis.ceRepository" . -}}
2021
{{- range .Values.redisVersions }}
2122
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
2223
{{- if or (eq .major "8") (eq .major "5") }}
23-
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository }}
24+
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
2425
{{- end }}
2526
{{- range .mirrorVersions }}
2627
- name: {{ .version }}

‎addons/redis/templates/paramsdef-redis-cluster.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
{{- $redisCeRepo := include "redis.ceRepository" . -}}
12
{{- range .Values.redisVersions }}
23
{{- $version := .major }}
34
{{- $redisImage := printf "%s/%s:%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository .defaultImageTag }}
5+
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
46
{{- if or (eq .major "8") (eq .major "5") }}
5-
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository .defaultImageTag }}
7+
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo .defaultImageTag }}
8+
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
69
{{- end }}
710
{{- $pd := $.Files.Get "config/redis-config-effect-scope.yaml" | fromYaml }}
811
---
@@ -27,6 +30,12 @@ spec:
2730
- name: kb-tools
2831
asContainerImage: true
2932
image: {{ $redisImage }}
33+
imageMappings:
34+
{{- range .mirrorVersions }}
35+
- serviceVersions:
36+
- {{ .version }}
37+
image: {{ $redisRepository }}:{{ .imageTag }}
38+
{{- end }}
3039

3140
fileName: redis.conf
3241
# ConfigurationSchema that impose restrictions on engine parameter's rule

‎addons/redis/templates/paramsdef-redis.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# reuse redis7-config-effect-scope.
2+
{{- $redisCeRepo := include "redis.ceRepository" . -}}
23
{{- range .Values.redisVersions }}
34
{{- $version := .major }}
45
{{- if eq .major "8" }}
56
{{ $version = "7" }}
67
{{- end }}
78
{{- $redisImage := printf "%s/%s:%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository .defaultImageTag }}
9+
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
810
{{- if or (eq .major "8") (eq .major "5") }}
9-
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository .defaultImageTag }}
11+
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo .defaultImageTag }}
12+
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
1013
{{- end }}
1114
{{- $pd := $.Files.Get "config/redis-config-effect-scope.yaml" | fromYaml }}
1215
---
@@ -31,6 +34,12 @@ spec:
3134
- name: kb-tools
3235
asContainerImage: true
3336
image: {{ $redisImage }}
37+
imageMappings:
38+
{{- range .mirrorVersions }}
39+
- serviceVersions:
40+
- {{ .version }}
41+
image: {{ $redisRepository }}:{{ .imageTag }}
42+
{{- end }}
3443

3544
fileName: redis.conf
3645
# ConfigurationSchema that impose restrictions on engine parameter's rule

0 commit comments

Comments
 (0)