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/07/11 08:00:16 UTC
[apisix-ingress-controller] branch apisix-v2.14 created (now dee1d2ac)
This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a change to branch apisix-v2.14
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
at dee1d2ac chore: update APISIX v2.14.1
This branch includes the following new commits:
new dee1d2ac chore: update APISIX v2.14.1
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[apisix-ingress-controller] 01/01: chore: update APISIX v2.14.1
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangjintao pushed a commit to branch apisix-v2.14
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git
commit dee1d2ac6d900a4984796d50ce75606d21b343bf
Author: Jintao Zhang <zh...@gmail.com>
AuthorDate: Mon Jul 11 07:53:54 2022 +0000
chore: update APISIX v2.14.1
Signed-off-by: Jintao Zhang <zh...@gmail.com>
---
Makefile | 4 ++--
test/e2e/suite-annotations/redirect.go | 6 +++---
test/e2e/suite-plugins/suite-plugins-authentication/hmac.go | 4 ++--
test/e2e/suite-plugins/suite-plugins-general/redirect.go | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 829e0cbb..d271cc24 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,8 @@ push-ingress-images:
.PHONY: push-images
push-images:
ifeq ($(E2E_SKIP_BUILD), 0)
- docker pull apache/apisix:2.13.1-alpine
- docker tag apache/apisix:2.13.1-alpine $(REGISTRY)/apache/apisix:dev
+ docker pull apache/apisix:2.14.1-alpine
+ docker tag apache/apisix:2.14.1-alpine $(REGISTRY)/apache/apisix:dev
docker push $(REGISTRY)/apache/apisix:dev
docker pull bitnami/etcd:3.4.14-debian-10-r0
diff --git a/test/e2e/suite-annotations/redirect.go b/test/e2e/suite-annotations/redirect.go
index 0bb15a43..4de56665 100644
--- a/test/e2e/suite-annotations/redirect.go
+++ b/test/e2e/suite-annotations/redirect.go
@@ -58,7 +58,7 @@ spec:
resp := s.NewAPISIXClient().GET("/sample").WithHeader("Host", "httpbin.org").Expect()
resp.Status(http.StatusMovedPermanently)
- resp.Header("Location").Equal("https://httpbin.org/sample")
+ resp.Header("Location").Equal("https://httpbin.org:9443/sample")
})
ginkgo.It("redirect http-to-https in ingress networking/v1beta1", func() {
@@ -88,7 +88,7 @@ spec:
resp := s.NewAPISIXClient().GET("/sample").WithHeader("Host", "httpbin.org").Expect()
resp.Status(http.StatusMovedPermanently)
- resp.Header("Location").Equal("https://httpbin.org/sample")
+ resp.Header("Location").Equal("https://httpbin.org:9443/sample")
})
ginkgo.It("redirect http-to-https in ingress extensions/v1beta1", func() {
@@ -118,7 +118,7 @@ spec:
resp := s.NewAPISIXClient().GET("/sample").WithHeader("Host", "httpbin.org").Expect()
resp.Status(http.StatusMovedPermanently)
- resp.Header("Location").Equal("https://httpbin.org/sample")
+ resp.Header("Location").Equal("https://httpbin.org:9443/sample")
})
ginkgo.It("redirect http-redirect in ingress networking/v1", func() {
diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go b/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go
index 72df2634..c8d070d8 100644
--- a/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go
+++ b/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go
@@ -108,7 +108,7 @@ spec:
Status(http.StatusUnauthorized).
Body().
Raw()
- assert.Contains(ginkgo.GinkgoT(), msg, "access key or signature missing")
+ assert.Contains(ginkgo.GinkgoT(), msg, "client request can't be validated")
msg = s.NewAPISIXClient().GET("/ip").
WithHeader("Host", "httpbin.org").
@@ -214,7 +214,7 @@ spec:
Status(http.StatusUnauthorized).
Body().
Raw()
- assert.Contains(ginkgo.GinkgoT(), msg, "access key or signature missing")
+ assert.Contains(ginkgo.GinkgoT(), msg, "client request can't be validated")
msg = s.NewAPISIXClient().GET("/ip").
WithHeader("Host", "httpbin.org").
diff --git a/test/e2e/suite-plugins/suite-plugins-general/redirect.go b/test/e2e/suite-plugins/suite-plugins-general/redirect.go
index dbe25472..fff21068 100644
--- a/test/e2e/suite-plugins/suite-plugins-general/redirect.go
+++ b/test/e2e/suite-plugins/suite-plugins-general/redirect.go
@@ -63,7 +63,7 @@ spec:
resp := s.NewAPISIXClient().GET("/ip").WithHeader("Host", "httpbin.org").Expect()
resp.Status(http.StatusMovedPermanently)
- resp.Header("Location").Equal("https://httpbin.org/ip")
+ resp.Header("Location").Equal("https://httpbin.org:9443/ip")
})
ginkgo.It("redirect to specific uri", func() {
backendSvc, backendPorts := s.DefaultHTTPBackend()