Skip to content

Commit ce3ecb4

Browse files
AlinsRanCopilot
andcommitted
chore: migrate image registry from hkccr to ghcr.io
Replace hkccr.ccs.tencentyun.com/api7-dev/ with ghcr.io/api7/ across all workflow files, Makefile, and test framework configs. Update the private registry login step to use GHCR with GITHUB_TOKEN instead of Tencent Cloud credentials. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent b02e842 commit ce3ecb4

6 files changed

Lines changed: 24 additions & 24 deletions

File tree

.github/workflows/conformance-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ jobs:
6363
username: ${{ secrets.DOCKER_USERNAME }}
6464
password: ${{ secrets.DOCKER_PASSWORD }}
6565

66-
- name: Login to Private Registry
66+
- name: Login to GHCR
6767
uses: docker/login-action@v3
6868
with:
69-
registry: hkccr.ccs.tencentyun.com
70-
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
71-
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
69+
registry: ghcr.io
70+
username: ${{ github.actor }}
71+
password: ${{ secrets.GITHUB_TOKEN }}
7272

7373
- name: Build images
7474
env:

.github/workflows/e2e-test-k8s.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ jobs:
5858
chmod 700 get_helm.sh
5959
./get_helm.sh
6060
61-
- name: Login to Private Registry
61+
- name: Login to GHCR
6262
uses: docker/login-action@v3
6363
with:
64-
registry: hkccr.ccs.tencentyun.com
65-
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
66-
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
64+
registry: ghcr.io
65+
username: ${{ github.actor }}
66+
password: ${{ secrets.GITHUB_TOKEN }}
6767

6868
- name: Launch Kind Cluster
6969
env:

.github/workflows/e2e-test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ jobs:
7272
username: ${{ secrets.DOCKER_USERNAME }}
7373
password: ${{ secrets.DOCKER_PASSWORD }}
7474

75-
- name: Login to Private Registry
75+
- name: Login to GHCR
7676
uses: docker/login-action@v3
7777
with:
78-
registry: hkccr.ccs.tencentyun.com
79-
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
80-
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
78+
registry: ghcr.io
79+
username: ${{ github.actor }}
80+
password: ${{ secrets.GITHUB_TOKEN }}
8181

8282
- name: Build images
8383
env:

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,22 +202,22 @@ kind-down:
202202

203203
.PHONY: kind-load-images
204204
kind-load-images: pull-infra-images kind-load-ingress-image kind-load-adc-image
205-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME)
206-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
207-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
205+
@kind load docker-image ghcr.io/api7/api7-ee-3-gateway:dev --name $(KIND_NAME)
206+
@kind load docker-image ghcr.io/api7/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
207+
@kind load docker-image ghcr.io/api7/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
208208
@kind load docker-image kennethreitz/httpbin:latest --name $(KIND_NAME)
209209
@kind load docker-image jmalloc/echo-server:latest --name $(KIND_NAME)
210210
@kind load docker-image apache/apisix:dev --name $(KIND_NAME)
211211
@kind load docker-image openresty/openresty:1.27.1.2-4-bullseye-fat --name $(KIND_NAME)
212212

213213
.PHONY: kind-load-gateway-image
214214
kind-load-gateway-image:
215-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev --name $(KIND_NAME)
215+
@kind load docker-image ghcr.io/api7/api7-ee-3-gateway:dev --name $(KIND_NAME)
216216

217217
.PHONY: kind-load-dashboard-images
218218
kind-load-dashboard-images:
219-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
220-
@kind load docker-image hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
219+
@kind load docker-image ghcr.io/api7/api7-ee-dp-manager:$(DASHBOARD_VERSION) --name $(KIND_NAME)
220+
@kind load docker-image ghcr.io/api7/api7-ee-3-integrated:$(DASHBOARD_VERSION) --name $(KIND_NAME)
221221

222222
.PHONY: kind-load-ingress-image
223223
kind-load-ingress-image:
@@ -231,9 +231,9 @@ kind-load-adc-image:
231231

232232
.PHONY: pull-infra-images
233233
pull-infra-images:
234-
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
235-
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)
236-
@docker pull hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)
234+
@docker pull ghcr.io/api7/api7-ee-3-gateway:dev
235+
@docker pull ghcr.io/api7/api7-ee-dp-manager:$(DASHBOARD_VERSION)
236+
@docker pull ghcr.io/api7/api7-ee-3-integrated:$(DASHBOARD_VERSION)
237237
@docker pull kennethreitz/httpbin:latest
238238
@docker pull jmalloc/echo-server:latest
239239
@docker pull ghcr.io/api7/adc:dev

test/e2e/framework/api7_dashboard.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func init() {
4545
tmpl, err := template.New("values.yaml").Parse(`
4646
dashboard:
4747
image:
48-
repository: hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated
48+
repository: ghcr.io/api7/api7-ee-3-integrated
4949
pullPolicy: IfNotPresent
5050
tag: {{ .Tag }}
5151
extraEnvVars:
@@ -61,7 +61,7 @@ dashboard:
6161
mountPath: /app/covdatafiles
6262
dp_manager:
6363
image:
64-
repository: hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager
64+
repository: ghcr.io/api7/api7-ee-dp-manager
6565
pullPolicy: IfNotPresent
6666
tag: {{ .Tag }}
6767
extraEnvVars:

test/e2e/framework/manifests/dp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ spec:
181181
spec:
182182
#serviceAccountName: ginkgo
183183
containers:
184-
- image: hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev
184+
- image: ghcr.io/api7/api7-ee-3-gateway:dev
185185
imagePullPolicy: IfNotPresent
186186
env:
187187
{{- if not .TLSEnabled }}

0 commit comments

Comments
 (0)