Merge branch 'main' into support/switchover-before-update-pods

apecloud · Jan 2, 2025 · cd659d6 · cd659d6
2 parents f3e5b4c + 1ede668
commit cd659d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/deploy/helm/templates/configmap.yaml b/deploy/helm/templates/configmap.yaml
@@ -17,6 +17,11 @@ data:
     # the default storage class name.
     DEFAULT_STORAGE_CLASS: {{ include "kubeblocks.defaultStorageClass" . | quote }}
 
+    {{- with .Values.registryConfig }}
+    registries:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -314,6 +314,13 @@ dataPlane:
             values:
             - "true"
 
+# dynamically replace instance's registry. ref: https://github.com/apecloud/kubeblocks/pull/8018
+# e.g.
+# registryConfig: 
+#   defaultRegistry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
+#   defaultNamespace: apecloud
+registryConfig: {}
+
 # Add extra pod labels to KubeBlocks Deployment
 extraLabels: {}