This is an automated email from the ASF dual-hosted git repository.
AlinsRan pushed a commit to branch feat/webhook-adc-validation
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/feat/webhook-adc-validation by
this push:
new 742f11b4 fix: use mirrored images in self-hosted e2e
742f11b4 is described below
commit 742f11b46ad289aa7d8dd54cda1611d53b742531
Author: rongxin <[email protected]>
AuthorDate: Mon Apr 27 17:12:36 2026 +0800
fix: use mirrored images in self-hosted e2e
Co-authored-by: Copilot <[email protected]>
---
.github/workflows/e2e-test-k8s.yml | 9 +++++++++
Makefile | 38 +++++++++++++++++++++++++-------------
2 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/.github/workflows/e2e-test-k8s.yml
b/.github/workflows/e2e-test-k8s.yml
index 94f0e2f2..82b1f96b 100644
--- a/.github/workflows/e2e-test-k8s.yml
+++ b/.github/workflows/e2e-test-k8s.yml
@@ -62,6 +62,13 @@ jobs:
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
+ - name: Login to Registry
+ uses: docker/login-action@v3
+ with:
+ registry: ${{ secrets.DOCKER_REGISTRY }}
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_PASSWORD }}
+
- name: Launch Kind Cluster
env:
KIND_NODE_IMAGE: kindest/node:v1.18.15
@@ -102,6 +109,8 @@ jobs:
make download-api7ee3-chart
- name: Loading Docker Image to Kind Cluster
+ env:
+ DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
run: |
make kind-load-images
diff --git a/Makefile b/Makefile
index c62a3cb2..1e8d8897 100644
--- a/Makefile
+++ b/Makefile
@@ -224,25 +224,37 @@ kind-load-adc-image:
.PHONY: pull-infra-images
pull-infra-images:
- @for image in \
- hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev \
-
hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION) \
-
hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION) \
- kennethreitz/httpbin:latest \
- jmalloc/echo-server:latest \
- ghcr.io/api7/adc:dev \
- apache/apisix:dev \
- openresty/openresty:1.27.1.2-4-bullseye-fat; do \
+ @retry_pull() { \
+ source="$$1"; \
+ target="$$2"; \
for attempt in 1 2 3; do \
- docker pull $$image && break; \
+ if docker pull "$$source"; then \
+ if [ "$$source" != "$$target" ]; then \
+ docker tag "$$source" "$$target"; \
+ fi; \
+ return 0; \
+ fi; \
if [ $$attempt -eq 3 ]; then \
- echo "failed to pull $$image after $$attempt
attempts" >&2; \
+ echo "failed to pull $$source after $$attempt
attempts" >&2; \
exit 1; \
fi; \
- echo "retrying docker pull for $$image (attempt
$$((attempt + 1))/3)..." >&2; \
+ echo "retrying docker pull for $$source (attempt
$$((attempt + 1))/3)..." >&2; \
sleep 5; \
done; \
- done
+ }; \
+ retry_pull "hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev"
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev"; \
+ retry_pull
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)"
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-dp-manager:$(DASHBOARD_VERSION)"; \
+ retry_pull
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)"
"hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-integrated:$(DASHBOARD_VERSION)"; \
+ if [ -n "$$DOCKER_REGISTRY" ]; then \
+ retry_pull "$$DOCKER_REGISTRY/kennethreitz/httpbin:latest"
"kennethreitz/httpbin:latest"; \
+ retry_pull "$$DOCKER_REGISTRY/jmalloc/echo-server:latest"
"jmalloc/echo-server:latest"; \
+ else \
+ retry_pull "kennethreitz/httpbin:latest"
"kennethreitz/httpbin:latest"; \
+ retry_pull "jmalloc/echo-server:latest"
"jmalloc/echo-server:latest"; \
+ fi; \
+ retry_pull "ghcr.io/api7/adc:dev" "ghcr.io/api7/adc:dev"; \
+ retry_pull "apache/apisix:dev" "apache/apisix:dev"; \
+ retry_pull "openresty/openresty:1.27.1.2-4-bullseye-fat"
"openresty/openresty:1.27.1.2-4-bullseye-fat"
##@ Build
