Skip to content

chore: The backup and parameter images version should be consistent with the main Redis container. #2449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangyelei merged 1 commit into from
Feb 11, 2026
Merged

chore: The backup and parameter images version should be consistent with the main Redis container. #2449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions addons/redis/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,19 +143,19 @@ redis-cluster-scripts-template-{{ .Chart.Version }}

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

{{- define "metrics.repository" -}}
{{ .Values.metrics.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.metrics.image.repository}}
{{- end }}}
{{- end }}

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

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

{{/*
Generate scripts configmap
Expand Down Expand Up @@ -183,4 +183,13 @@ redis-account.sh: |-

{{- define "apeDts.reshard.image" -}}
{{ .Values.image.apeDts.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.image.apeDts.repository}}:{{ .Values.image.apeDts.reshardTag }}
{{- end }}}
{{- end }}

{{- define "redis.ceRepository" -}}
{{ $registry := .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" )}}
{{- if eq $registry "docker.io" -}}
{{- .Values.ceImage.repository -}}
{{- else -}}
apecloud/redis
{{- end -}}
{{- end -}}
34 changes: 12 additions & 22 deletions addons/redis/templates/backuppolicytemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,28 +43,18 @@ spec:
- name: IMAGE
valueFrom:
versionMapping:
- serviceVersions:
- "6.2.18"
mappedValue: "{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:6.2.6-v19"
- serviceVersions:
- "7.4.5"
- "7.4.6"
- "7.4.7"
mappedValue: "{{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:7.4.0-v8"
- serviceVersions:
- "8.0.1"
- "8.0.2"
- "8.0.3"
- "8.0.4"
- "8.0.5"
mappedValue: "{{ .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.ceImage.repository }}:8.0.5"
- serviceVersions:
- "8.2.1"
- "8.2.3"
mappedValue: "{{ .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.ceImage.repository }}:8.2.3"
- serviceVersions:
- "8.4.0"
mappedValue: "{{ .Values.ceImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.ceImage.repository }}:8.4.0"
{{- $redisCeRepo := include "redis.ceRepository" . -}}
{{- range .Values.redisVersions }}
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
{{- if or (eq .major "8") (eq .major "5") }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
{{- end }}
{{- range .mirrorVersions }}
- serviceVersions:
- {{ .version }}
mappedValue: {{ $redisRepository }}:{{ .imageTag }}
{{- end }}
{{- end }}
- name: volume-snapshot
snapshotVolumes: true
targetVolumes:
Expand Down
3 changes: 2 additions & 1 deletion addons/redis/templates/cmpv-redis-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ spec:
{{- end }}
{{- end }}
releases:
{{- $redisCeRepo := include "redis.ceRepository" . -}}
{{- range .Values.redisVersions }}
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
{{- if or (eq .major "8") (eq .major "5") }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" )) $redisCeRepo }}
{{- end }}
{{- range .mirrorVersions }}
- name: {{ .version }}
Expand Down
3 changes: 2 additions & 1 deletion addons/redis/templates/cmpv-redis-sentinel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ spec:
{{- end }}
{{- end }}
releases:
{{- $redisCeRepo := include "redis.ceRepository" . }}
{{- range .Values.redisVersions }}
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
{{- if or (eq .major "8") (eq .major "5") }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
{{- end }}
{{- range .mirrorVersions }}
- name: {{ .version }}
Expand Down
3 changes: 2 additions & 1 deletion addons/redis/templates/cmpv-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ spec:
{{- end }}
{{- end }}
releases:
{{- $redisCeRepo := include "redis.ceRepository" . -}}
{{- range .Values.redisVersions }}
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
{{- if or (eq .major "8") (eq .major "5") }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
{{- end }}
{{- range .mirrorVersions }}
- name: {{ .version }}
Expand Down
11 changes: 10 additions & 1 deletion addons/redis/templates/paramsdef-redis-cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{{- $redisCeRepo := include "redis.ceRepository" . -}}
{{- range .Values.redisVersions }}
{{- $version := .major }}
{{- $redisImage := printf "%s/%s:%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository .defaultImageTag }}
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
{{- if or (eq .major "8") (eq .major "5") }}
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository .defaultImageTag }}
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo .defaultImageTag }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
{{- end }}
{{- $pd := $.Files.Get "config/redis-config-effect-scope.yaml" | fromYaml }}
---
Expand All @@ -27,6 +30,12 @@ spec:
- name: kb-tools
asContainerImage: true
image: {{ $redisImage }}
imageMappings:
{{- range .mirrorVersions }}
- serviceVersions:
- {{ .version }}
image: {{ $redisRepository }}:{{ .imageTag }}
{{- end }}

fileName: redis.conf
# ConfigurationSchema that impose restrictions on engine parameter's rule
Expand Down
11 changes: 10 additions & 1 deletion addons/redis/templates/paramsdef-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# reuse redis7-config-effect-scope.
{{- $redisCeRepo := include "redis.ceRepository" . -}}
{{- range .Values.redisVersions }}
{{- $version := .major }}
{{- if eq .major "8" }}
{{ $version = "7" }}
{{- end }}
{{- $redisImage := printf "%s/%s:%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository .defaultImageTag }}
{{- $redisRepository := printf "%s/%s" ( $.Values.image.registry | default "docker.io" ) $.Values.image.repository }}
{{- if or (eq .major "8") (eq .major "5") }}
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $.Values.ceImage.repository .defaultImageTag }}
{{- $redisImage = printf "%s/%s:%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo .defaultImageTag }}
{{- $redisRepository = printf "%s/%s" ( $.Values.ceImage.registry | default ( $.Values.image.registry | default "docker.io" ) ) $redisCeRepo }}
{{- end }}
{{- $pd := $.Files.Get "config/redis-config-effect-scope.yaml" | fromYaml }}
---
Expand All @@ -31,6 +34,12 @@ spec:
- name: kb-tools
asContainerImage: true
image: {{ $redisImage }}
imageMappings:
{{- range .mirrorVersions }}
- serviceVersions:
- {{ .version }}
image: {{ $redisRepository }}:{{ .imageTag }}
{{- end }}

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