You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by zh...@apache.org on 2022/12/08 10:10:36 UTC
[apisix-ingress-controller] branch master updated: e2e: support docker hub as registry (#1489)
This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
The following commit(s) were added to refs/heads/master by this push:
new 051fc48d e2e: support docker hub as registry (#1489)
051fc48d is described below
commit 051fc48de133699cfd5d12e28358226913550871
Author: Xin Rong <al...@gmail.com>
AuthorDate: Thu Dec 8 18:10:29 2022 +0800
e2e: support docker hub as registry (#1489)
Co-authored-by: rongxin <al...@apache.org>
---
.github/workflows/e2e-test-ci-v2-cron.yml | 14 ++++----
.github/workflows/e2e-test-ci.yml | 14 ++++----
.github/workflows/k8s-timer-ci.yml | 14 ++++----
Makefile | 38 +++++++++++-----------
test/e2e/scaffold/apisix.go | 2 +-
test/e2e/scaffold/etcd.go | 2 +-
test/e2e/scaffold/httpbin.go | 2 +-
test/e2e/scaffold/ingress.go | 2 +-
test/e2e/scaffold/scaffold.go | 8 ++---
test/e2e/suite-annotations/websocket.go | 6 ++--
test/e2e/suite-features/external-sd.go | 2 +-
test/e2e/suite-features/external-service.go | 2 +-
test/e2e/suite-features/websocket.go | 2 +-
test/e2e/suite-gateway/gateway_httproute.go | 2 +-
.../suite-ingress-resource/resourcepushing.go | 2 +-
15 files changed, 55 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/e2e-test-ci-v2-cron.yml b/.github/workflows/e2e-test-ci-v2-cron.yml
index 9a7bcae8..82a783ce 100644
--- a/.github/workflows/e2e-test-ci-v2-cron.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron.yml
@@ -108,13 +108,13 @@ jobs:
echo "creating images cache..."
docker save \
- localhost:5000/apache/apisix:dev \
- localhost:5000/bitnami/etcd:dev \
- localhost:5000/apache/apisix-ingress-controller:dev \
- localhost:5000/kennethreitz/httpbin:dev \
- localhost:5000/test-backend:dev \
- localhost:5000/jmalloc/echo-server:dev \
- localhost:5000/busybox:dev \
+ ${REGISTRY}/apisix:dev \
+ ${REGISTRY}/etcd:dev \
+ ${REGISTRY}/apisix-ingress-controller:dev \
+ ${REGISTRY}/httpbin:dev \
+ ${REGISTRY}/test-backend:dev \
+ ${REGISTRY}/echo-server:dev \
+ ${REGISTRY}/busybox:dev \
| pigz > docker-v2.tar.gz
- name: cache
diff --git a/.github/workflows/e2e-test-ci.yml b/.github/workflows/e2e-test-ci.yml
index a1857550..30e80a8b 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -107,13 +107,13 @@ jobs:
echo "creating images cache..."
docker save \
- localhost:5000/apache/apisix:dev \
- localhost:5000/bitnami/etcd:dev \
- localhost:5000/apache/apisix-ingress-controller:dev \
- localhost:5000/kennethreitz/httpbin:dev \
- localhost:5000/test-backend:dev \
- localhost:5000/jmalloc/echo-server:dev \
- localhost:5000/busybox:dev \
+ ${REGISTRY}/apisix:dev \
+ ${REGISTRY}/etcd:dev \
+ ${REGISTRY}/apisix-ingress-controller:dev \
+ ${REGISTRY}/httpbin:dev \
+ ${REGISTRY}/test-backend:dev \
+ ${REGISTRY}/echo-server:dev \
+ ${REGISTRY}/busybox:dev \
| pigz > docker.tar.gz
- name: cache
diff --git a/.github/workflows/k8s-timer-ci.yml b/.github/workflows/k8s-timer-ci.yml
index 535d11ac..ebcaf419 100644
--- a/.github/workflows/k8s-timer-ci.yml
+++ b/.github/workflows/k8s-timer-ci.yml
@@ -97,13 +97,13 @@ jobs:
echo "creating images cache..."
docker save \
- localhost:5000/apache/apisix:dev \
- localhost:5000/bitnami/etcd:dev \
- localhost:5000/apache/apisix-ingress-controller:dev \
- localhost:5000/kennethreitz/httpbin:dev \
- localhost:5000/test-backend:dev \
- localhost:5000/jmalloc/echo-server:dev \
- localhost:5000/busybox:dev \
+ ${REGISTRY}/apisix:dev \
+ ${REGISTRY}/etcd:dev \
+ ${REGISTRY}/apisix-ingress-controller:dev \
+ ${REGISTRY}/httpbin:dev \
+ ${REGISTRY}/test-backend:dev \
+ ${REGISTRY}/echo-server:dev \
+ ${REGISTRY}/busybox:dev \
| pigz > docker.tar.gz
- name: cache
diff --git a/Makefile b/Makefile
index 58d6becf..b63344af 100644
--- a/Makefile
+++ b/Makefile
@@ -65,21 +65,21 @@ build:
### clean-image: clean apisix-ingress-controller image
.PHONY: clean-image
clean-image: ## Removes local image
- echo "removing old image $(REGISTRY)/apache/apisix-ingress-controller:$(IMAGE_TAG)"
- docker rmi -f $(REGISTRY)/apache/apisix-ingress-controller:$(IMAGE_TAG) || true
+ echo "removing old image $(REGISTRY)/apisix-ingress-controller:$(IMAGE_TAG)"
+ docker rmi -f $(REGISTRY)/apisix-ingress-controller:$(IMAGE_TAG) || true
### build-image: Build apisix-ingress-controller image
.PHONY: build-image
build-image:
ifeq ($(E2E_SKIP_BUILD), 0)
docker build -t apache/apisix-ingress-controller:$(IMAGE_TAG) --build-arg ENABLE_PROXY=$(ENABLE_PROXY) .
- docker tag apache/apisix-ingress-controller:$(IMAGE_TAG) $(REGISTRY)/apache/apisix-ingress-controller:$(IMAGE_TAG)
+ docker tag apache/apisix-ingress-controller:$(IMAGE_TAG) $(REGISTRY)/apisix-ingress-controller:$(IMAGE_TAG)
endif
### pack-image: Build and push Ingress image used in e2e test suites to kind or custom registry.
.PHONY: pack-image
pack-image: build-image
- docker push $(REGISTRY)/apache/apisix-ingress-controller:$(IMAGE_TAG)
+ docker push $(REGISTRY)/apisix-ingress-controller:$(IMAGE_TAG)
### pack-images: Build and push images used in e2e test suites to kind or custom registry.
.PHONY: pack-images
@@ -90,21 +90,21 @@ pack-images: build-images push-images
build-images: build-image
ifeq ($(E2E_SKIP_BUILD), 0)
docker pull apache/apisix:$(TARGET_APISIX_VERSION)
- docker tag apache/apisix:$(TARGET_APISIX_VERSION) $(REGISTRY)/apache/apisix:$(IMAGE_TAG)
+ docker tag apache/apisix:$(TARGET_APISIX_VERSION) $(REGISTRY)/apisix:$(IMAGE_TAG)
docker pull bitnami/etcd:3.4.14-debian-10-r0
- docker tag bitnami/etcd:3.4.14-debian-10-r0 $(REGISTRY)/bitnami/etcd:$(IMAGE_TAG)
+ docker tag bitnami/etcd:3.4.14-debian-10-r0 $(REGISTRY)/etcd:$(IMAGE_TAG)
docker pull kennethreitz/httpbin
- docker tag kennethreitz/httpbin $(REGISTRY)/kennethreitz/httpbin:$(IMAGE_TAG)
+ docker tag kennethreitz/httpbin $(REGISTRY)/httpbin:$(IMAGE_TAG)
docker build -t test-backend:$(IMAGE_TAG) --build-arg ENABLE_PROXY=$(ENABLE_PROXY) ./test/e2e/testbackend
docker tag test-backend:$(IMAGE_TAG) $(REGISTRY)/test-backend:$(IMAGE_TAG)
- docker tag apache/apisix-ingress-controller:$(IMAGE_TAG) $(REGISTRY)/apache/apisix-ingress-controller:$(IMAGE_TAG)
+ docker tag apache/apisix-ingress-controller:$(IMAGE_TAG) $(REGISTRY)/apisix-ingress-controller:$(IMAGE_TAG)
docker pull jmalloc/echo-server:latest
- docker tag jmalloc/echo-server:latest $(REGISTRY)/jmalloc/echo-server:$(IMAGE_TAG)
+ docker tag jmalloc/echo-server:latest $(REGISTRY)/echo-server:$(IMAGE_TAG)
docker pull busybox:1.28
docker tag busybox:1.28 $(REGISTRY)/busybox:$(IMAGE_TAG)
@@ -114,12 +114,12 @@ endif
.PHONY: push-images
push-images:
ifeq ($(E2E_SKIP_BUILD), 0)
- docker push $(REGISTRY)/apache/apisix:$(IMAGE_TAG)
- docker push $(REGISTRY)/bitnami/etcd:$(IMAGE_TAG)
- docker push $(REGISTRY)/kennethreitz/httpbin:$(IMAGE_TAG)
+ docker push $(REGISTRY)/apisix:$(IMAGE_TAG)
+ docker push $(REGISTRY)/etcd:$(IMAGE_TAG)
+ docker push $(REGISTRY)/httpbin:$(IMAGE_TAG)
docker push $(REGISTRY)/test-backend:$(IMAGE_TAG)
- docker push $(REGISTRY)/apache/apisix-ingress-controller:$(IMAGE_TAG)
- docker push $(REGISTRY)/jmalloc/echo-server:$(IMAGE_TAG)
+ docker push $(REGISTRY)/apisix-ingress-controller:$(IMAGE_TAG)
+ docker push $(REGISTRY)/echo-server:$(IMAGE_TAG)
docker push $(REGISTRY)/busybox:$(IMAGE_TAG)
endif
@@ -270,12 +270,12 @@ endif
.PHONY: kind-load-images
kind-load-images:
kind load docker-image --name=apisix \
- $(REGISTRY)/apache/apisix:dev \
- $(REGISTRY)/bitnami/etcd:dev \
- $(REGISTRY)/apache/apisix-ingress-controller:dev \
- $(REGISTRY)/kennethreitz/httpbin:dev \
+ $(REGISTRY)/apisix:dev \
+ $(REGISTRY)/etcd:dev \
+ $(REGISTRY)/apisix-ingress-controller:dev \
+ $(REGISTRY)/httpbin:dev \
$(REGISTRY)/test-backend:dev \
- $(REGISTRY)/jmalloc/echo-server:dev \
+ $(REGISTRY)/echo-server:dev \
$(REGISTRY)/busybox:dev
diff --git a/test/e2e/scaffold/apisix.go b/test/e2e/scaffold/apisix.go
index ce73fbf3..15482444 100644
--- a/test/e2e/scaffold/apisix.go
+++ b/test/e2e/scaffold/apisix.go
@@ -72,7 +72,7 @@ spec:
tcpSocket:
port: 9080
timeoutSeconds: 2
- image: "localhost:5000/apache/apisix:dev"
+ image: "localhost:5000/apisix:dev"
imagePullPolicy: IfNotPresent
name: apisix-deployment-e2e-test
ports:
diff --git a/test/e2e/scaffold/etcd.go b/test/e2e/scaffold/etcd.go
index 99b34247..ee852157 100644
--- a/test/e2e/scaffold/etcd.go
+++ b/test/e2e/scaffold/etcd.go
@@ -65,7 +65,7 @@ spec:
tcpSocket:
port: 2379
timeoutSeconds: 2
- image: "localhost:5000/bitnami/etcd:dev"
+ image: "localhost:5000/etcd:dev"
imagePullPolicy: IfNotPresent
name: etcd-deployment-e2e-test
ports:
diff --git a/test/e2e/scaffold/httpbin.go b/test/e2e/scaffold/httpbin.go
index 9ead5cb7..e538618d 100644
--- a/test/e2e/scaffold/httpbin.go
+++ b/test/e2e/scaffold/httpbin.go
@@ -63,7 +63,7 @@ spec:
tcpSocket:
port: 80
timeoutSeconds: 2
- image: "localhost:5000/kennethreitz/httpbin:dev"
+ image: "localhost:5000/httpbin:dev"
imagePullPolicy: IfNotPresent
name: httpbin-deployment-e2e-test
ports:
diff --git a/test/e2e/scaffold/ingress.go b/test/e2e/scaffold/ingress.go
index 92c226af..d0617bc9 100644
--- a/test/e2e/scaffold/ingress.go
+++ b/test/e2e/scaffold/ingress.go
@@ -357,7 +357,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.name
- image: "localhost:5000/apache/apisix-ingress-controller:dev"
+ image: "localhost:5000/apisix-ingress-controller:dev"
imagePullPolicy: IfNotPresent
name: ingress-apisix-controller-deployment-e2e-test
ports:
diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go
index f8be5f44..6e12431a 100644
--- a/test/e2e/scaffold/scaffold.go
+++ b/test/e2e/scaffold/scaffold.go
@@ -146,12 +146,10 @@ func NewScaffold(o *Options) *Scaffold {
}
if o.APISIXAdminAPIVersion == "" {
adminVersion := os.Getenv("APISIX_ADMIN_API_VERSION")
- log.Errorw("admin api version")
- if adminVersion == "v3" {
- o.APISIXAdminAPIVersion = "v3"
+ if adminVersion != "" {
+ o.APISIXAdminAPIVersion = adminVersion
} else {
- // fallback to v2
- o.APISIXAdminAPIVersion = "v2"
+ o.APISIXAdminAPIVersion = "v3"
}
}
if o.APISIXConfigPath == "" {
diff --git a/test/e2e/suite-annotations/websocket.go b/test/e2e/suite-annotations/websocket.go
index c7bf6d2c..cf75c2aa 100644
--- a/test/e2e/suite-annotations/websocket.go
+++ b/test/e2e/suite-annotations/websocket.go
@@ -40,7 +40,7 @@ metadata:
spec:
containers:
- name: websocket-server
- image: localhost:5000/jmalloc/echo-server:dev
+ image: localhost:5000/echo-server:dev
ports:
- containerPort: 8080
---
@@ -126,7 +126,7 @@ metadata:
spec:
containers:
- name: websocket-server
- image: localhost:5000/jmalloc/echo-server:dev
+ image: localhost:5000/echo-server:dev
ports:
- containerPort: 8080
---
@@ -210,7 +210,7 @@ metadata:
spec:
containers:
- name: websocket-server
- image: localhost:5000/jmalloc/echo-server:dev
+ image: localhost:5000/echo-server:dev
ports:
- containerPort: 8080
---
diff --git a/test/e2e/suite-features/external-sd.go b/test/e2e/suite-features/external-sd.go
index b93ee531..aaa9bb03 100644
--- a/test/e2e/suite-features/external-sd.go
+++ b/test/e2e/suite-features/external-sd.go
@@ -160,7 +160,7 @@ spec:
tcpSocket:
port: 80
timeoutSeconds: 2
- image: "localhost:5000/kennethreitz/httpbin:dev"
+ image: "localhost:5000/httpbin:dev"
imagePullPolicy: IfNotPresent
name: httpbin
ports:
diff --git a/test/e2e/suite-features/external-service.go b/test/e2e/suite-features/external-service.go
index 03fbc24a..a15c1641 100644
--- a/test/e2e/suite-features/external-service.go
+++ b/test/e2e/suite-features/external-service.go
@@ -210,7 +210,7 @@ spec:
tcpSocket:
port: 80
timeoutSeconds: 2
- image: "localhost:5000/kennethreitz/httpbin:dev"
+ image: "localhost:5000/httpbin:dev"
imagePullPolicy: IfNotPresent
name: httpbin
ports:
diff --git a/test/e2e/suite-features/websocket.go b/test/e2e/suite-features/websocket.go
index 43763138..729e8c25 100644
--- a/test/e2e/suite-features/websocket.go
+++ b/test/e2e/suite-features/websocket.go
@@ -41,7 +41,7 @@ metadata:
spec:
containers:
- name: websocket-server
- image: localhost:5000/jmalloc/echo-server:dev
+ image: localhost:5000/echo-server:dev
ports:
- containerPort: 8080
---
diff --git a/test/e2e/suite-gateway/gateway_httproute.go b/test/e2e/suite-gateway/gateway_httproute.go
index 29d27399..46c8849d 100644
--- a/test/e2e/suite-gateway/gateway_httproute.go
+++ b/test/e2e/suite-gateway/gateway_httproute.go
@@ -379,7 +379,7 @@ spec:
spec:
containers:
- name: echo
- image: localhost:5000/jmalloc/echo-server:dev
+ image: localhost:5000/echo-server:dev
ports:
- containerPort: 8080
---
diff --git a/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go b/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go
index c6000189..65ae32b5 100644
--- a/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go
+++ b/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go
@@ -602,7 +602,7 @@ spec:
tcpSocket:
port: 80
timeoutSeconds: 2
- image: "localhost:5000/kennethreitz/httpbin:dev"
+ image: "localhost:5000/httpbin:dev"
imagePullPolicy: IfNotPresent
name: httpbin-temp
ports: