Skip to content

Commit

Permalink
chore: switch aliyun image registry infracreate to apecloud
Browse files Browse the repository at this point in the history
  • Loading branch information
JashBook committed Jul 3, 2024
1 parent c37b27f commit 782df93
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions addons/apecloud-mysql/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.

image:
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/apecloud-mysql-server
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
Expand Down Expand Up @@ -116,7 +116,7 @@ wesqlscale:
cell: "zone1"
image:
# if the value of wesqlscale.image.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/apecloud-mysql-scale
tag: "0.2.7"
pullPolicy: IfNotPresent
Expand Down
8 changes: 4 additions & 4 deletions addons/llm/templates/clusterversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
versionsContext:
initContainers:
- name: download
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/baichuan-llama-7b:ggmlv3.q4_0
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/baichuan-llama-7b:ggmlv3.q4_0
command: ["sh", "-c", "cp /models/baichuan-llama-7b.ggmlv3.q4_0.bin /models-target/"]
volumeMounts:
- name: models
Expand Down Expand Up @@ -78,7 +78,7 @@ spec:
versionsContext:
initContainers:
- name: download
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/baichuan2-13b-gguf:ggml-model-q4
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/baichuan2-13b-gguf:ggml-model-q4
command: ["sh", "-c", "cp /models/ggml-model-q4.gguf /models-target/"]
volumeMounts:
- name: models
Expand Down Expand Up @@ -108,7 +108,7 @@ spec:
versionsContext:
initContainers:
- name: download
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/replit-code-3b:ggml-model-f16
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/replit-code-3b:ggml-model-f16
command: ["sh", "-c", "cp /models/ggml-model-f16.gguf /models-target/"]
volumeMounts:
- name: models
Expand Down Expand Up @@ -138,7 +138,7 @@ spec:
versionsContext:
initContainers:
- name: download
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/codeshell-7b-chat:codeshell-chat-q4_0
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/codeshell-7b-chat:codeshell-chat-q4_0
command: ["sh", "-c", "cp /models/codeshell-chat-q4_0.gguf /models-target/"]
volumeMounts:
- name: models
Expand Down
2 changes: 1 addition & 1 deletion addons/llm/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
repository: apecloud/vllm
pullPolicy: IfNotPresent
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
# Overrides the image tag whose default is the chart appVersion.
tag: v0.2.7-amd64
imageDev:
Expand Down
2 changes: 1 addition & 1 deletion addons/mogdb/templates/swithover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
podSpec:
containers:
- name: switchover
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/kubeblocks-tools:0.8.2
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/kubeblocks-tools:0.8.2
imagePullPolicy: IfNotPresent
command:
- /bin/sh
Expand Down
2 changes: 1 addition & 1 deletion addons/mongodb/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.

image:
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/mongo
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
Expand Down
8 changes: 4 additions & 4 deletions addons/mysql/templates/clusterversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
- /bin/syncer
- /config
- /kubeblocks/
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:latest
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:latest
imagePullPolicy: {{ include "mysql.imagePullPolicy" . }}
name: init-syncer
volumeMounts:
Expand All @@ -41,7 +41,7 @@ spec:
- -r
- /xtrabackup-2.4
- /kubeblocks/xtrabackup
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:mysql
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:mysql
imagePullPolicy: {{ include "mysql.imagePullPolicy" . }}
name: init-xtrabackup
volumeMounts:
Expand Down Expand Up @@ -103,7 +103,7 @@ spec:
- /bin/syncer
- /config
- /kubeblocks/
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:latest
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:latest
imagePullPolicy: {{ include "mysql.imagePullPolicy" . }}
name: init-syncer
volumeMounts:
Expand All @@ -114,7 +114,7 @@ spec:
- -r
- /xtrabackup-8.0
- /kubeblocks/xtrabackup
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:mysql
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/syncer:mysql
imagePullPolicy: {{ include "mysql.imagePullPolicy" . }}
name: init-xtrabackup
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions addons/mysql/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.

image:
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/mysql
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
Expand Down Expand Up @@ -73,7 +73,7 @@ roleProbe:

metrics:
image:
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/agamotto
tag: 0.1.2-beta.1
pullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion addons/opengauss/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ metrics:
## @param metrics.image.pullSecrets Specify image pull secrets
##
image:
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/agamotto
tag: 0.1.0-beta.5
pullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion addons/oracle/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Create the name of the service account to use

{{- define "oracle.imageRegistry" }}
{{- if not .Values.image.registry }}
{{- "infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com" }}
{{- "apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com" }}
{{- else }}
{{- .Values.image.registry }}
{{- end}}
Expand Down
4 changes: 2 additions & 2 deletions addons/orioledb/values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## @section OrioleDB common parameters

image:
# registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
# registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/orioledb
tag: beta1
pullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion addons/postgresql/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
## @param image.debug Specify if debug values should be set
##
image:
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/spilo
digest: ""
tags:
Expand Down
2 changes: 1 addition & 1 deletion addons/pulsar/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ debugEnabled: false
## Default Pulsar image
image:
## image.registry is the top level registry config
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/pulsar
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
Expand Down
8 changes: 4 additions & 4 deletions addons/redis/templates/clusterversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@ spec:
versionsContext:
containers:
- name: redis
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }}
systemAccountSpec:
cmdExecutorConfig:
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
- componentDefRef: redis-sentinel
versionsContext:
initContainers:
- name: init-redis-sentinel
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }}
containers:
- name: redis-sentinel
image: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
image: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC8
imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }}
- componentDefRef: redis-twemproxy
versionsContext:
Expand Down
8 changes: 4 additions & 4 deletions addons/redis/templates/componentversion-redis-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ spec:
changes:
serviceVersion: 7.2.4
images:
redis-cluster: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.2.0-v10
metrics: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
redis-cluster: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.2.0-v10
metrics: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
- name: 7.0.6
changes:
serviceVersion: 7.0.6
images:
redis-cluster: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC4
metrics: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
redis-cluster: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC4
metrics: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
4 changes: 2 additions & 2 deletions addons/redis/templates/componentversion-redis-sentinel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ spec:
changes:
serviceVersion: 7.2.4
images:
redis-sentinel: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.2.0-v10
redis-sentinel: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.2.0-v10
- name: 7.0.6
changes:
serviceVersion: 7.0.6
images:
redis-sentinel: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC4
redis-sentinel: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC4
8 changes: 4 additions & 4 deletions addons/redis/templates/componentversion-redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ spec:
changes:
serviceVersion: 7.2.4
images:
redis: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.2.0-v10
metrics: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
redis: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.2.0-v10
metrics: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
- name: 7.0.6
changes:
serviceVersion: 7.0.6
images:
redis: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC4
metrics: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
redis: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/redis-stack-server:7.0.6-RC4
metrics: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com/apecloud/agamotto:0.1.2-beta.1
2 changes: 1 addition & 1 deletion addons/redis/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ image:
# Redis Stack Server, which combines open source Redis with RediSearch, RedisJSON, RedisGraph, RedisTimeSeries, and RedisBloom,
# is dual-licensed under the Redis Source Available License (RSALv2), as described below, and the Server Side Public License (SSPL)
# For information about licensing per version, see https://redis.io/docs/stack/license/
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/redis-stack-server
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
Expand Down
2 changes: 1 addition & 1 deletion addons/tdengine/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ securityContext: {}

metrics:
image:
registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
repository: apecloud/taoskeeper
tag: 0.0.5
pullPolicy: IfNotPresent
Expand Down
2 changes: 1 addition & 1 deletion addons/xinference/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
image:
repository: xprobe/xinference
pullPolicy: IfNotPresent
# registry: infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com
# registry: apecloud-registry.cn-zhangjiakou.cr.aliyuncs.com
registry: docker.io
# Overrides the image tag whose default is the chart appVersion.
tag: v0.11.0
Expand Down

0 comments on commit 782df93

Please sign in to comment.