chore:change 0.8 default registry and namespace (#986)

Co-authored-by: huangzhangshu <[email protected]>

.github/workflows/check-chart-pr-review.yml

@@ -11,8 +11,13 @@ jobs:
   check-helm:
     name: check helm
     if: github.event.review.state == 'approved'
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    strategy:
+      fail-fast: false
+      matrix:
+        registry: [ "", "dockerhub", "aliyun" ]
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
       CHART_DIR: "addons"
-      APECD_REF: "v0.1.40"
+      APECD_REF: "v0.1.68"
+      SET_REGISTRY: "${{ matrix.registry }}"
     secrets: inherit

.github/workflows/check-chart-push.yml

@@ -12,8 +12,13 @@ on:
 
 jobs:
   check-helm:
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    strategy:
+      fail-fast: false
+      matrix:
+        registry: [ "", "dockerhub", "aliyun" ]
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
       CHART_DIR: "addons"
-      APECD_REF: "v0.1.40"
+      APECD_REF: "v0.1.68"
+      SET_REGISTRY: "${{ matrix.registry }}"
     secrets: inherit

.github/workflows/release-chart.yml

@@ -101,22 +101,22 @@ run-name: Release Chart ${{ inputs.chart_dir }} ${{ inputs.chart_version }}
 jobs:
   release-chart:
     if: ${{ inputs.chart_dir != '' }}
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected].52
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected].68
     with:
       VERSION: "${{ inputs.chart_version }}"
       CHART_DIR: "addons"
       SPECIFY_CHART: "${{ inputs.chart_dir }}"
-      APECD_REF: "v0.1.52"
+      APECD_REF: "v0.1.68"
     secrets: inherit
 
   release-chart-all:
     if: ${{ inputs.chart_dir == '' }}
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected].52
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected].68
     with:
       VERSION: "${{ inputs.chart_version }}"
       CHART_DIR: "addons"
       SPECIFY_CHART: "${{ inputs.chart_dir }}"
-      APECD_REF: "v0.1.52"
+      APECD_REF: "v0.1.68"
       ENABLE_JIHU: false
     secrets: inherit
 
@@ -137,10 +137,10 @@ jobs:
                       pulsar, pulsar-cluster, qdrant, qdrant-cluster, redis, redis-cluster, risingwave, risingwave-cluster,
                       starrocks, starrocks-cluster, tdengine, tdengine-cluster, tidb, tidb-cluster, weaviate,
                       weaviate-cluster, xinference, xinference-cluster, zookeeper, zookeeper-cluster ]
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected].52
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected].68
     with:
       VERSION: "${{ inputs.chart_version }}"
       CHART_DIR: "addons"
       SPECIFY_CHART: "${{ matrix.addon-name }}"
-      APECD_REF: "v0.1.52"
+      APECD_REF: "v0.1.68"
     secrets: inherit

addons/apecloud-mysql/templates/_helpers.tpl

@@ -175,5 +175,5 @@ Generate scripts configmap
 Backup Tool image
 */}}
 {{- define "apecloud-mysql.bakcupToolImage" -}}
-{{ .Values.backupTool.image.registry | default .Values.image.registry }}/{{ .Values.backupTool.image.repository}}:{{ .Values.backupTool.image.tag }}
+{{ .Values.backupTool.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.backupTool.image.repository}}:{{ .Values.backupTool.image.tag }}
 {{- end }}

addons/apecloud-mysql/templates/clusterdefinition.yaml

@@ -487,7 +487,7 @@ spec:
         initContainers:
           - name: wait-vtctld-ready
             imagePullPolicy: IfNotPresent
-            image: {{ .Values.image.registry | default "docker.io" }}/apecloud/busybox:1.35
+            image: {{ .Values.busybox.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.busybox.image.repository }}:{{ .Values.busybox.image.tag }}
             env:
               - name: VTCTLD_HOST
                 value: "$(KB_CLUSTER_NAME)-vtcontroller-headless"

addons/apecloud-mysql/templates/clusterversion-auditlog.yaml

@@ -40,10 +40,10 @@ spec:
                 rm -rf {{ .Values.mysqlConfigs.dataMountPath }}/plugin/
                 /scripts/setup.sh
           - name: vttablet
-            image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+            image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
           - name: metrics
-            image: {{ .Values.metrics.image.registry | default .Values.image.registry }}/{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}
+            image: {{ .Values.metrics.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}
             imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
       systemAccountSpec:
         cmdExecutorConfig:
@@ -55,17 +55,17 @@ spec:
       versionsContext:
         containers:
           - name: etcd
-            image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+            image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
           - name: vtctld
-            image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+            image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
           - name: vtconsensus
-            image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+            image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
     - componentDefRef: vtgate
       versionsContext:
         containers:
           - name: vtgate
-            image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+            image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}

addons/apecloud-mysql/templates/clusterversion.yaml

@@ -16,10 +16,10 @@ spec:
         image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
       - name: vttablet
-        image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+        image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
         imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
       - name: metrics
-        image:  {{ .Values.metrics.image.registry | default .Values.image.registry }}/{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}
+        image:  {{ .Values.metrics.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}
         imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
     systemAccountSpec:
       cmdExecutorConfig:
@@ -31,17 +31,17 @@ spec:
     versionsContext:
       containers:
         - name: etcd
-          image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+          image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
           imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
         - name: vtctld
-          image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+          image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
           imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
         - name: vtconsensus
-          image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+          image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
           imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}
   - componentDefRef: vtgate
     versionsContext:
       containers:
         - name: vtgate
-          image: {{ .Values.wesqlscale.image.registry | default .Values.image.registry }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
+          image: {{ .Values.wesqlscale.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.wesqlscale.image.repository }}:{{ .Values.wesqlscale.image.tag }}
           imagePullPolicy: {{ default "IfNotPresent" .Values.wesqlscale.image.pullPolicy }}

addons/apecloud-mysql/templates/componentdefinition.yaml

@@ -201,7 +201,7 @@ spec:
             exec:
               command: [ "/scripts/pre-stop.sh" ]
       - name: metrics
-        image: {{ .Values.metrics.image.registry | default .Values.image.registry }}/{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}
+        image: {{ .Values.metrics.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.metrics.image.repository }}:{{ .Values.metrics.image.tag }}
         imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }}
         command: [ "/scripts/agamotto.sh" ]
         env:

addons/apecloud-mysql/values.yaml

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 image:
-  registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
+  registry: docker.io
   repository: apecloud/apecloud-mysql-server
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
@@ -119,6 +119,14 @@ wesqlscale:
     tag: "0.2.6"
     pullPolicy: IfNotPresent
 
+busybox:
+  image:
+    # if the value of busybox.image.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default
+    registry: ""
+    repository: busybox
+    tag: "1.35"
+    pullPolicy: IfNotPresent
+
 ## @param resourceNamePrefix Prefix for all resources name created by this chart, that can avoid name conflict
 ## if you install multiple releases of this chart.
 ## If specified, the cluster definition will use it as name.

addons/apecloud-postgresql/values.yaml

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 image:
-  registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
+  registry: docker.io
   repository: apecloud/apecloud-postgres
   tag: latest
   digest: ""

addons/camellia-redis-proxy/templates/_helpers.tpl

@@ -69,7 +69,7 @@ Define image
 {{- end }}
 
 {{- define "busybox.image" -}}
-{{ .Values.busyboxImage.registry | default "docker.io"}}/{{ .Values.busyboxImage.repository}}:{{ .Values.busyboxImage.tag }}
+{{ .Values.busyboxImage.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.busyboxImage.repository}}:{{ .Values.busyboxImage.tag }}
 {{- end }}}
 
 

addons/camellia-redis-proxy/values.yaml

@@ -5,14 +5,15 @@
 image:
   # refer: https://github.com/caojiajun/camellia-jdk21-bootstraps/blob/main/docs/redis-proxy/Dockerfile
   # this is the image of camellia-redis-proxy, which is built from Dockerfile of Apecloud/camellia-redis-proxy forked from caojiajun/camellia-jdk21-bootstraps.
-  registry: ""
+  registry: docker.io
   repository: apecloud/camellia-redis-proxy
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: 1.2.26
 
 busyboxImage:
-  registry: docker.io
+  # if the value of busyboxImage.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default
+  registry: ""
   repository: busybox
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.

addons/clickhouse/templates/clusterversion.yaml

@@ -17,18 +17,18 @@ spec:
       versionsContext:
         containers:
           - name: clickhouse
-            image: {{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
+            image: {{ .Values.image.registry | default "docker.io" }}/ {{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
     - componentDefRef: ch-keeper
       versionsContext:
         containers:
           - name: clickhouse
-            image: {{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
+            image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
     - componentDefRef: zookeeper
       versionsContext:
         containers:
           - name: zookeeper
-            image: {{ .Values.zookeeper.image.repository }}:{{ .Values.zookeeper.image.tag }}
+            image: {{ .Values.zookeeper.image.registry | default ( .Values.image.registry | default "docker.io" ) }}/{{ .Values.zookeeper.image.repository }}:{{ .Values.zookeeper.image.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.zookeeper.image.pullPolicy }}
 

addons/clickhouse/values.yaml

@@ -17,14 +17,17 @@ logConfigs: {}
 commonAnnotations: {}
 
 image:
-  repository: docker.io/bitnami/clickhouse
+  registry: docker.io
+  repository: bitnami/clickhouse
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: 22.9.4-debian-11-r1
 
 zookeeper:
   image:
-    repository: docker.io/bitnami/zookeeper
+    # if the value of zookeeper.image.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default
+    registry: ""
+    repository: bitnami/zookeeper
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     tag: 3.8.0-debian-11-r47   

addons/doris/templates/_helpers.tpl

@@ -71,5 +71,5 @@ app.kubernetes.io/name: {{ include "doris.name" . }}
 Define image
 */}}
 {{- define "doris.image" -}}
-{{ .Values.images.doris.fe.repository }}:{{ .Values.images.doris.fe.tag }}
+{{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.doris.fe.repository }}:{{ .Values.images.doris.fe.tag }}
 {{- end }}

addons/doris/templates/clusterversion.yaml

@@ -14,13 +14,13 @@ spec:
       versionsContext:
         containers:
           - name: doris-fe
-            image: {{ .Values.images.registry }}/{{ .Values.images.doris.fe.repository }}:{{ default .Chart.AppVersion .Values.images.doris.fe.tag }}
+            image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.doris.fe.repository }}:{{ default .Chart.AppVersion .Values.images.doris.fe.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
             securityContext:
               allowPrivilegeEscalation: false
               runAsUser: 0
           - name: mysql-root-script
-            image: {{ .Values.images.registry }}/{{ .Values.images.doris.fe.repository }}:{{ default .Chart.AppVersion .Values.images.doris.fe.tag }}
+            image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.doris.fe.repository }}:{{ default .Chart.AppVersion .Values.images.doris.fe.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
             securityContext:
               allowPrivilegeEscalation: false
@@ -29,11 +29,11 @@ spec:
       versionsContext:
         initContainers:
           - name: sysctl
-            image: {{ .Values.images.registry }}/{{ .Values.images.doris.cn.initrepository | default "docker.io" }}:{{ .Values.images.doris.cn.inittag }}
+            image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.init.repository }}:{{ .Values.images.init.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
         containers:
           - name: doris-cn
-            image: {{ .Values.images.registry }}/{{ .Values.images.doris.cn.repository }}:{{ default .Chart.AppVersion .Values.images.doris.cn.tag }}
+            image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.doris.cn.repository }}:{{ default .Chart.AppVersion .Values.images.doris.cn.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
             securityContext:
               allowPrivilegeEscalation: false
@@ -42,11 +42,11 @@ spec:
       versionsContext:
         initContainers:
           - name: sysctl
-            image: {{ .Values.images.registry }}/{{ .Values.images.doris.be.initrepository | default "docker.io" }}:{{ .Values.images.doris.be.inittag }}
+            image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.init.repository }}:{{ .Values.images.init.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
         containers:
           - name: doris-be
-            image: {{ .Values.images.registry }}/{{ .Values.images.doris.be.repository }}:{{ default .Chart.AppVersion .Values.images.doris.be.tag }}
+            image: {{ .Values.images.registry | default "docker.io" }}/{{ .Values.images.doris.be.repository }}:{{ default .Chart.AppVersion .Values.images.doris.be.tag }}
             imagePullPolicy: {{ default "IfNotPresent" .Values.images.pullPolicy }}
             securityContext:
               allowPrivilegeEscalation: false

addons/doris/values.yaml

@@ -15,21 +15,20 @@ commonLabels:
 ## @param application images
 ##
 images:
-  registry: registry.cn-hangzhou.aliyuncs.com/yq_doris
+  registry: registry.cn-hangzhou.aliyuncs.com
   pullPolicy: IfNotPresent
+  init:
+    repository: yq_doris/busybox
+    tag: latest
   doris:
     fe:
-      repository: apache-doris
+      repository: yq_doris/apache-doris
       tag: 2.0.3-fe
     be:
-      initrepository: busybox
-      inittag: latest
-      repository: apache-doris
+      repository: yq_doris/apache-doris
       tag: 2.0.3-be
     cn:
-      initrepository: busybox
-      inittag: latest
-      repository: apache-doris
+      repository: yq_doris/apache-doris
       tag: 2.0.3-be
 ## @param fe env FE_INIT_NUMBER
 ##

addons/elasticsearch/templates/clusterversion.yaml

@@ -11,7 +11,7 @@ spec:
     versionsContext:
       initContainers:
       - name: sysctl
-        image: {{ .Values.image.registry | default "docker.io" }}/busybox:1.35
+        image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.busybox.repository}}:{{ .Values.image.busybox.tag }}
         imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
       - name: prepare-plugins
         image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.plugin.repository}}:{{ default .Chart.AppVersion .Values.image.plugin.tag }}

addons/elasticsearch/values.yaml

@@ -24,6 +24,9 @@ image:
   tools:
     repository: apecloud/curl-jq
     tag: latest
+  busybox:
+    repository: busybox
+    tag: 1.35
 
 imagePullSecrets: [ ]
 nameOverride: ""