From 1e546291dfd03f63f8a60f62286cdec81087f26c Mon Sep 17 00:00:00 2001 From: xuriwuyun Date: Fri, 19 Jul 2024 11:11:18 +0800 Subject: [PATCH] chore: update syncer image registory --- .../apecloud-postgresql/templates/clusterdefinition.yaml | 4 ++-- addons/mongodb/templates/componentdefinition.yaml | 4 ++-- addons/mongodb/values.yaml | 3 +++ addons/mysql/templates/clusterversion.yaml | 8 ++++---- addons/mysql/values.yaml | 3 +++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/addons/apecloud-postgresql/templates/clusterdefinition.yaml b/addons/apecloud-postgresql/templates/clusterdefinition.yaml index 8dd7a2578..d4106d44f 100644 --- a/addons/apecloud-postgresql/templates/clusterdefinition.yaml +++ b/addons/apecloud-postgresql/templates/clusterdefinition.yaml @@ -58,7 +58,7 @@ spec: initContainers: - name: init-syncer image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:{{ .Values.image.syncer.tag }} - imagePullPolicy: Always + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} command: - sh - -c @@ -187,4 +187,4 @@ spec: scope: AnyPods statements: creation: CREATE USER $(USERNAME) SUPERUSER PASSWORD '$(PASSWD)'; - deletion: DROP USER IF EXISTS $(USERNAME); \ No newline at end of file + deletion: DROP USER IF EXISTS $(USERNAME); diff --git a/addons/mongodb/templates/componentdefinition.yaml b/addons/mongodb/templates/componentdefinition.yaml index a2fb27a6e..c2cae4207 100644 --- a/addons/mongodb/templates/componentdefinition.yaml +++ b/addons/mongodb/templates/componentdefinition.yaml @@ -89,8 +89,8 @@ spec: - /bin/syncer - /config - /kubeblocks/ - image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:0.1.0 - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:{{ .Values.image.syncer.tag }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} name: init-syncer volumeMounts: - mountPath: /kubeblocks diff --git a/addons/mongodb/values.yaml b/addons/mongodb/values.yaml index d271350ab..5df602853 100644 --- a/addons/mongodb/values.yaml +++ b/addons/mongodb/values.yaml @@ -8,6 +8,9 @@ image: pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: 5.0.14 # 6.0.3-debian-11-r0 + syncer: + repository: apecloud/syncer + tag: "0.1.2" walg: repository: apecloud/wal-g diff --git a/addons/mysql/templates/clusterversion.yaml b/addons/mysql/templates/clusterversion.yaml index 4fce36dc7..31919f7ab 100644 --- a/addons/mysql/templates/clusterversion.yaml +++ b/addons/mysql/templates/clusterversion.yaml @@ -30,7 +30,7 @@ spec: - /bin/syncer - /config - /kubeblocks/ - image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:0.1.0 + image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:{{ .Values.image.syncer.tag }} imagePullPolicy: {{ include "mysql.imagePullPolicy" . }} name: init-syncer volumeMounts: @@ -41,7 +41,7 @@ spec: - -r - /xtrabackup-2.4 - /kubeblocks/xtrabackup - image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:mysql + image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:mysql imagePullPolicy: {{ include "mysql.imagePullPolicy" . }} name: init-xtrabackup volumeMounts: @@ -103,7 +103,7 @@ spec: - /bin/syncer - /config - /kubeblocks/ - image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:0.1.0 + image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:{{ .Values.image.syncer.tag }} imagePullPolicy: {{ include "mysql.imagePullPolicy" . }} name: init-syncer volumeMounts: @@ -114,7 +114,7 @@ spec: - -r - /xtrabackup-8.0 - /kubeblocks/xtrabackup - image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:mysql + image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.syncer.repository }}:mysql imagePullPolicy: {{ include "mysql.imagePullPolicy" . }} name: init-xtrabackup volumeMounts: diff --git a/addons/mysql/values.yaml b/addons/mysql/values.yaml index 8a4c35859..09bd828cf 100644 --- a/addons/mysql/values.yaml +++ b/addons/mysql/values.yaml @@ -10,6 +10,9 @@ image: #tag: 8.0.33 tag: 5.7.44 xtraBackupRepository: apecloud/percona-xtrabackup + syncer: + repository: apecloud/syncer + tag: "0.1.2" ## MySQL Cluster parameters cluster: