Skip to content

Commit

Permalink
Replace the original image URL pixiuio with pixiucloud (#519)
Browse files Browse the repository at this point in the history
  • Loading branch information
youdian-xiaoshuai authored and swm committed Dec 30, 2024
1 parent 84b7842 commit ed34626
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions ansible/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ api_interface_address: "{{ hostvars[inventory_hostname]['ansible_' + api_interfa
image_repository: "registry.cn-hangzhou.aliyuncs.com/google_containers"

# 自定义镜像仓库
app_image_repository: "harbor.cloud.pixiuio.com/pixiuio"
app_image_repository: "ccr.ccs.tencentyun.com/pixiucloud"

# 自定义 REPO 仓库
repo_dir: "/etc/kubez/repo"
Expand Down Expand Up @@ -86,7 +86,7 @@ docker_data_dir: "{{ runtime_data_dir }}"
containerd_data_dir: "{{ runtime_data_dir }}"

# cir-dockerd 的二进制文件镜像
cri_dockerd_image: "harbor.cloud.pixiuio.com/pixiuio/cri-dockerd:v0.3.10"
cri_dockerd_image: "ccr.ccs.tencentyun.com/pixiucloud/cri-dockerd:v0.3.10"

node_config_directory: "/etc/kubez/"

Expand Down Expand Up @@ -148,7 +148,7 @@ enable_helm: "yes"

# v3.5.2 and v3.9.0 is available, default is v3.9.0
helm_release: v3.9.0
helm_image: "harbor.cloud.pixiuio.com/pixiuio/helm-toolbox:{{ helm_release }}"
helm_image: "ccr.ccs.tencentyun.com/pixiucloud/helm-toolbox:{{ helm_release }}"

#######################
# StorageClass Options
Expand Down Expand Up @@ -250,7 +250,7 @@ prometheus_adapter_repository_name: "{{ default_repo_name }}"
prometheus_adapter_repository_url: "{{ default_repo_url }}"
prometheus_adapter_repository_path: "{{ default_repo_name }}/prometheus-adapter"
prometheus_adapter_version: "4.11.0"
prometheus_adapter_image_repository: "harbor.cloud.pixiuio.com/pixiuio/prometheus-adapter"
prometheus_adapter_image_repository: "ccr.ccs.tencentyun.com/pixiucloud/prometheus-adapter"
prometheus_adapter_image_tag: "v0.12.0"

prometheus_url: http://kube-prometheus-stack-prometheus.pixiu-system.svc
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/kubernetes/templates/pixiu-autoscaler.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
- pixiu-autoscaler
containers:
- name: pixiu-autoscaler-controller
image: harbor.cloud.pixiuio.com/pixiuio/pixiu-autoscaler-controller:latest
image: {{ app_image_repository }}/pixiu-autoscaler-controller:latest
imagePullPolicy: IfNotPresent
command:
- pixiu-autoscaler-controller
Expand Down
8 changes: 4 additions & 4 deletions ansible/roles/kubernetes/templates/tekton.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ spec:
serviceAccountName: tekton-pipelines-controller
containers:
- name: tekton-pipelines-controller
image: harbor.cloud.pixiuio.com/pixiuio/controller:v0.43.2
image: {{ app_image_repository }}/controller:v0.43.2
args: [
# These images are built on-demand by `ko resolve` and are replaced
# by image references by digest.
Expand Down Expand Up @@ -2027,7 +2027,7 @@ spec:
serviceAccountName: tekton-pipelines-resolvers
containers:
- name: controller
image: harbor.cloud.pixiuio.com/pixiuio/resolvers:v0.43.2
image: {{ app_image_repository }}/resolvers:v0.43.2
resources:
requests:
cpu: 100m
Expand Down Expand Up @@ -2163,7 +2163,7 @@ spec:
- name: webhook
# This is the Go import path for the binary that is containerized
# and substituted here.
image: harbor.cloud.pixiuio.com/pixiuio/webhook:v0.43.2
image: {{ app_image_repository }}/webhook:v0.43.2
# Resource request required for autoscaler to take any action for a metric
resources:
requests:
Expand Down Expand Up @@ -2626,7 +2626,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: harbor.cloud.pixiuio.com/pixiuio/dashboard:v0.31.0
image: {{ app_image_repository }}/dashboard:v0.31.0
livenessProbe:
httpGet:
path: /health
Expand Down
2 changes: 1 addition & 1 deletion docs/install/all-in-one.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
5. (可选)修改基础应用镜像仓库

```bash
编辑 /etc/kubez/globals.yml 文件,修改 app_image_repository: "" 为期望镜像仓库,默认是 pixiu镜像仓库 harbor.cloud.pixiuio.com/pixiuio
编辑 /etc/kubez/globals.yml 文件,修改 app_image_repository: "" 为期望镜像仓库,默认是 pixiu镜像仓库 hccr.ccs.tencentyun.com/pixiucloud
```

6. 执行如下命令,进行 `kubernetes` 的依赖安装
Expand Down
2 changes: 1 addition & 1 deletion docs/install/availability.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

7. (可选)修改基础应用镜像仓库
```bash
编辑 /etc/kubez/globals.yml 文件,修改 app_image_repository: "" 为期望镜像仓库,默认是 pixiu镜像仓库 harbor.cloud.pixiuio.com/pixiuio
编辑 /etc/kubez/globals.yml 文件,修改 app_image_repository: "" 为期望镜像仓库,默认是 pixiu镜像仓库 hccr.ccs.tencentyun.com/pixiucloud
```

8. 执行如下命令,进行 `kubernetes` 的依赖安装
Expand Down
2 changes: 1 addition & 1 deletion docs/install/multinode.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

6. (可选)修改基础应用镜像仓库
```bash
编辑 /etc/kubez/globals.yml 文件,修改 app_image_repository: "" 为期望镜像仓库,默认是 pixiu镜像仓库 harbor.cloud.pixiuio.com/pixiuio
编辑 /etc/kubez/globals.yml 文件,修改 app_image_repository: "" 为期望镜像仓库,默认是 pixiu镜像仓库 hccr.ccs.tencentyun.com/pixiucloud
```

7. 执行如下命令,进行 `kubernetes` 的依赖安装
Expand Down
8 changes: 4 additions & 4 deletions etc/kubez/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ network_interface: "eth0"
image_repository: "registry.cn-hangzhou.aliyuncs.com/google_containers"

# 自定义镜像仓库
app_image_repository: "harbor.cloud.pixiuio.com/pixiuio"
app_image_repository: "hccr.ccs.tencentyun.com/pixiucloud"

# 自定义 REPO 仓库
repo_dir: "/etc/kubez/repo"
Expand Down Expand Up @@ -61,7 +61,7 @@ containerd_data_dir: "{{ runtime_data_dir }}"
# kubernetes(1.24.0+) 使用 runtime 为 docker
####################
# cir-dockerd 的二进制文件镜像
#cri_dockerd_image: "harbor.cloud.pixiuio.com/pixiuio/cri-dockerd:v0.3.10"
#cri_dockerd_image: "hccr.ccs.tencentyun.com/pixiucloud/cri-dockerd:v0.3.10"

#####################
# keepalived options
Expand Down Expand Up @@ -249,7 +249,7 @@ s3:

# v3.5.2 and v3.9.0 is available, default is v3.9.0
#helm_release: v3.9.0
#helm_image: "harbor.cloud.pixiuio.com/pixiuio/helm-toolbox:{{ helm_release }}"
#helm_image: "hccr.ccs.tencentyun.com/pixiucloud/helm-toolbox:{{ helm_release }}"

########################
# Elasticsearch Options
Expand Down Expand Up @@ -450,7 +450,7 @@ s3:
#prometheus_adapter_repository_url: "{{ default_repo_url }}"
#prometheus_adapter_path: "{{ default_repo_name }}/prometheus-adapter"
#prometheus_adapter_version: "4.11.0"
#prometheus_adapter_image_repository: "harbor.cloud.pixiuio.com/pixiuio/prometheus-adapter"
#prometheus_adapter_image_repository: "hccr.ccs.tencentyun.com/pixiucloud/prometheus-adapter"
#prometheus_adapter_image_tag: "v0.12.0"

#prometheus_url: http://kube-prometheus-stack-prometheus.pixiu-system.svc
Expand Down

0 comments on commit ed34626

Please sign in to comment.