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 af03e7a9 chore: update APISIX v2.14.1 (#1145)
af03e7a9 is described below
commit af03e7a95785d0905f33a3458ce2cda02db41853
Author: Jintao Zhang <[email protected]>
AuthorDate: Tue Jul 26 20:15:28 2022 +0800
chore: update APISIX v2.14.1 (#1145)
---
Makefile | 9 +-
test/e2e/suite-annotations/redirect.go | 6 +-
.../suite-ingress/suite-ingress-resource/ssl.go | 415 ++++++++++-----------
.../suite-plugins-authentication/hmac.go | 4 +-
.../suite-plugins-general/redirect.go | 2 +-
5 files changed, 216 insertions(+), 220 deletions(-)
diff --git a/Makefile b/Makefile
index bcd6ecbc..1ed5f5ae 100644
--- a/Makefile
+++ b/Makefile
@@ -73,12 +73,12 @@ pack-ingress-image:
.PHONY: pack-images
pack-images: build-images push-images
-### build-image: Build apisix-ingress-controller image
+### build-images: Prepare all required Images
.PHONY: build-images
-build-images:
+build-images: build-image
ifeq ($(E2E_SKIP_BUILD), 0)
- docker pull apache/apisix:2.13.1-alpine
- docker tag apache/apisix:2.13.1-alpine
$(REGISTRY)/apache/apisix:$(IMAGE_TAG)
+ docker pull apache/apisix:2.14.1-alpine
+ docker tag apache/apisix:2.14.1-alpine
$(REGISTRY)/apache/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)
@@ -89,7 +89,6 @@ ifeq ($(E2E_SKIP_BUILD), 0)
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 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 pull jmalloc/echo-server:latest
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-ingress/suite-ingress-resource/ssl.go
b/test/e2e/suite-ingress/suite-ingress-resource/ssl.go
index 8cdc8e69..4e618ba6 100644
--- a/test/e2e/suite-ingress/suite-ingress-resource/ssl.go
+++ b/test/e2e/suite-ingress/suite-ingress-resource/ssl.go
@@ -249,220 +249,215 @@ var _ = ginkgo.Describe("suite-ingress-resource:
ApisixTls mTLS Test", func() {
// These certs come from mTLS practice
rootCA := `-----BEGIN CERTIFICATE-----
-MIIGEjCCA/qgAwIBAgIUJgGBjfayA0ZB+iWklvizaah7eq0wDQYJKoZIhvcNAQEL
-BQAwgYgxCzAJBgNVBAYTAkNOMRAwDgYDVQQIDAdCZWlqaW5nMRAwDgYDVQQHDAdC
-ZWlqaW5nMRYwFAYDVQQKDA1BcGFjaGUtQVBJU0lYMRcwFQYDVQQDDA5BUElTSVgt
-SW5ncmVzczEkMCIGCSqGSIb3DQEJARYVZGV2QGFwaXNpeC5hcGFjaGUub3JnMB4X
-DTIyMDUzMDIzMTE0MVoXDTMyMDUyNzIzMTE0MVowgYgxCzAJBgNVBAYTAkNOMRAw
-DgYDVQQIDAdCZWlqaW5nMRAwDgYDVQQHDAdCZWlqaW5nMRYwFAYDVQQKDA1BcGFj
-aGUtQVBJU0lYMRcwFQYDVQQDDA5BUElTSVgtSW5ncmVzczEkMCIGCSqGSIb3DQEJ
-ARYVZGV2QGFwaXNpeC5hcGFjaGUub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEArikPh5fAuFOOYZGoYp3DR8wrWE5hM02/OeOykj0gPXPUsU8/VWd6
-stYjGu62hA1MY1hxWbzN7BDnIo/irOhJu1d1pSeRiGlEZAOqV7EKg0/t4ZrQr/TB
-iUcQwiIIEVZwNKn1YWfTneq67vSMQ+jyMebyMkFIDGmApyayoZPEGtLSW8azqge+
-wMvAayM3uCoeo1WUnX3oTV/VyNuPwcOzSwbHvJrAIkjnob68jkvZUNZPL5l50hGz
-x+L7VnMVmzz9OVUCMEA/uZ7eM/bh1jPes56ySvyLMF0RDhKUdURRo6xWyGJRnZcs
-B4AHJEHHahFJFoctKkCNP2gC9oLW8/sH7HwZWwfmS6Dn/YVe7dJznN0n78orPf0r
-fgJCly2KGxeJFfPROsFMGfZ79NLL8Q3CylCc/hwpMLIVFBKA9NePmpKY/0TtYp8C
-TSu+KENzAEvOPXw0o9Kmr+/oGaLzZW61OFh1GkpEQt2deDT3LBBiGbk7YMm8eLcg
-DrsDhH1lumag00Xw34fL67jEt541OeekHBcw8kEgWHWmS5xepRTeVBu9xh8HeoVp
-kO2bF56teuh4jWkmclP/1gKD/kGt+2qPDNcyKXCjd45DxWa7/ryHiAqYuzgRHYs2
-j+4GJlH/UNwc8kSHviyiVKVDU7lzgww4gUQEfaARk8/MjmX1fnZcqzMCAwEAAaNy
-MHAwHQYDVR0OBBYEFCD4iZRLmy3bPxKyk8+46G6xHZ1aMB8GA1UdIwQYMBaAFCD4
-iZRLmy3bPxKyk8+46G6xHZ1aMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0RBBYwFIIS
-bXRscy5odHRwYmluLmxvY2FsMA0GCSqGSIb3DQEBCwUAA4ICAQCIgBcfghjJe1ZF
-k+JdCn0aDUaNokChTuOlJ4CvT8hr/08xI8DGK8uVCzPDe1OPvc/0B9cYlguGlJIo
-tOUtOdhulDRGmw4sGoOLRb9leZXtPdWoCNFZBhf0i5V+rQffFlZbdqu7fJcXCwFi
-2xUA8O2Lqu/6T3GO27GRDAmL+Qfn1G4PHI/+tRy5P1DNC5qTaZM7pe5D9n2XJVaE
-Z+PDsI3ZnY6s2raFM+6Yjq3l/S5F8HWkIv+C1RNp52Nq3UpL1qeG/XuOLot1lI0t
-wWTFYdCcyFGJRyW0V/Bk/PNlZ24wvXv2O+4xRVc139+VumDCb/qopVyHvkjLRUL3
-ILHa0AUJF8LF4Sh5NloPeE+p8y2f/fY5tCdr4Tz8/mLx8APrf2wbXH07lwI7F3TC
-bGkmSA9GqyVdZiM1XDyBKYpfJInzjOLPuzsd8xYAOJsg972jSD7oTHMKRiWkTEKC
-WTUIkcN8dZO3CxthRAWvIuXhkpGoN3OYRBODkUW1aJ6+cP25icMYXSK6uBudOYpY
-/yIdh6g3VCz7mN8KdEqeYKrw2cR0j01r1pqnh4YqLnC2TYar91MTK/6uQNPvaKIz
-yL0TPM7LtpidKkHe49y9XWgRUGfmq+1/gFCY/Vk0xrXNcCJYpzoTMyZ9zEZFP2iu
-djgSHn8f4ZS1qTtukbKsWFkq82jesw==
------END CERTIFICATE-----
-`
+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
+-----END CERTIFICATE-----`
serverCertSecret := `server-secret`
serverCert := `-----BEGIN CERTIFICATE-----
-MIIF0DCCA7igAwIBAgIUf2P2yoh6+RjG0ZJ72PNn7HbfKkcwDQYJKoZIhvcNAQEL
-BQAwgYgxCzAJBgNVBAYTAkNOMRAwDgYDVQQIDAdCZWlqaW5nMRAwDgYDVQQHDAdC
-ZWlqaW5nMRYwFAYDVQQKDA1BcGFjaGUtQVBJU0lYMRcwFQYDVQQDDA5BUElTSVgt
-SW5ncmVzczEkMCIGCSqGSIb3DQEJARYVZGV2QGFwaXNpeC5hcGFjaGUub3JnMB4X
-DTIyMDUzMDIzMTMyMloXDTMyMDQwNzIzMTMyMlowgYwxCzAJBgNVBAYTAkNOMRAw
-DgYDVQQIDAdCZWlqaW5nMRAwDgYDVQQHDAdCZWlqaW5nMRYwFAYDVQQKDA1BcGFj
-aGUtQVBJU0lYMRswGQYDVQQDDBJtdGxzLmh0dHBiaW4ubG9jYWwxJDAiBgkqhkiG
-9w0BCQEWFWRldkBhcGlzaXguYXBhY2hlLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAKzseBvWEooy23QdRIIkKlKsMv720PiUeEIGsIGOjtNhcTSp
-7e2zMw7kfrsvkmFUGdgajNCtQ3x/2jLncnS1kxKgS1ssOe0Fc5E7JuqiMtGPEhi3
-6YjzWUYqPC9mSr27EdtYiNATTytZJs1Xa7VoElZjtOpxy5MEFz3HPCjafGCdpRFY
-HEZ8vB890mPSEwOKspApYBPJfoUnby1n4PtMCt2xGeiaZ3NjNCqoS7OkCX9MjE4U
-KYZc2nhZi7BfpasTB9s5UbEmaZoSpSCAjtT5dWPEPmo3vpzAxd7ol8nbXJC+p/oq
-nVwhgiYc6wDHlSUDpua4lFoB9TBlN//saR+9/nfiT//YlgzlLrO92GmGIRzZNXzd
-g5G1cbPJWK72wKAY9fVTcVhvc7XEfLj1Qd9LJdhqEzQe/VfLyITqGKA5pVNBA5aD
-9Yb95fckgUq3me5Udb5dtE8Ua7oFF8ma4Vu9ao7bPujPdGFSb1NDc3T256HxhzQy
-cNyH2/WvsceGlv29ADc87j8v5t5BURSUgWylgshyehFdQ63co66D6RW7nDokaMHL
-UkRbm50EHZCjdSnRagra3UWKfjRK2JN631G6pXGyfncykzyV48qtmlzrboC9bb7T
-8A30d18Z3ZiB3QO/eMCC4FK+6XqJvYzPMxYvkWMAe6AIz0Jbw918xEeUVfdJAgMB
-AAGjLDAqMAkGA1UdEwQCMAAwHQYDVR0RBBYwFIISbXRscy5odHRwYmluLmxvY2Fs
-MA0GCSqGSIb3DQEBCwUAA4ICAQCG9X4hl3Bnd5Pc0vYeUFo/FLkg8z6BnM2/fUmL
-ty5uUAnU9NQOOQEKjQF4tU4o8+oexWlrjKXw//MOwpYAOJ3BrYNcqPOvX3mqhtVB
-ULBzLhQeFxmbwQ7ZNoB2nh+7tH+Z/fqddVE3QPG4TxyEOHEa4Zr6WZ0Ienh9c9nW
-GZGS3ggSNwdcxjapWPvwRNdFKylJTr57ebocoWc4NbRJxOny4E3Cl7yzT6MbYrsZ
-R2QyjVKG7pi/gbq2fpFip+BG2PyV9HRba47KoxF/29LQkdr4R16afdcrPdXT5qCA
-aDgEBHV7lHKz3yqGBrksB0LCG0MaT3mu80bhj4b5VhZ3ORrQ6gm1eyevJGZRaNgA
-s7POltX9sxLcEQO6F7FWGXs2tq+gTl1KT23QuFj7UgVQ0SMrefR6GibAwHO0TFmN
-HLlpYma1/zuU4QxI/+S+l4b6qx31TnUayRgOQn/J6vs+qZiD6fdugijQif4DsI3K
-QBDwI9IxqyvgCleMbvlRfFFIENUpf+uWjkqOO/2yax3egvOfoCojt193vlXHxOjK
-UROxuVcLmJgIUFR+KhqGibrk55oB5az7KVmV1OcUBhll6HI/SRDN/XRoJpDObczB
-B3vZ3vLBZTgVBX+8TATMAaRhIoa1dupvOmBc0DQRibpWhJvpl4WPsQRMVFM3p1Kw
-4e5kxA==
------END CERTIFICATE-----
-`
- serverKey := `-----BEGIN PRIVATE KEY-----
-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
-3h0xluQw6uolHPequOpCJAbnSSfasUE=
------END PRIVATE KEY-----
-`
+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
++KFB4CWLG1UPFpkLB22o8CWMnFdn2fji3jk=
+-----END CERTIFICATE-----`
+
+ serverKey := `-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----`
+
clientCASecret := `client-ca-secret`
clientCert := `-----BEGIN CERTIFICATE-----
-MIIF0DCCA7igAwIBAgIUf2P2yoh6+RjG0ZJ72PNn7HbfKkgwDQYJKoZIhvcNAQEL
-BQAwgYgxCzAJBgNVBAYTAkNOMRAwDgYDVQQIDAdCZWlqaW5nMRAwDgYDVQQHDAdC
-ZWlqaW5nMRYwFAYDVQQKDA1BcGFjaGUtQVBJU0lYMRcwFQYDVQQDDA5BUElTSVgt
-SW5ncmVzczEkMCIGCSqGSIb3DQEJARYVZGV2QGFwaXNpeC5hcGFjaGUub3JnMB4X
-DTIyMDUzMDIzMTY0NloXDTMyMDQwNzIzMTY0NlowgYwxCzAJBgNVBAYTAkNOMRAw
-DgYDVQQIDAdCZWlqaW5nMRAwDgYDVQQHDAdCZWlqaW5nMRYwFAYDVQQKDA1BcGFj
-aGUtQVBJU0lYMRswGQYDVQQDDBJtdGxzLmh0dHBiaW4ubG9jYWwxJDAiBgkqhkiG
-9w0BCQEWFWRldkBhcGlzaXguYXBhY2hlLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJzowwrITI3QTFjyADv6zoBAQFZ9Z5qcmvVFsEjdp97THFop
-MdImJ4qobZgKKwaYjQAopOTSqnU+WYlVFRyNTv4xOBbSWPx7xyed6IFWjg6U3DEE
-0N+pswg6sa9LtLNVl3Ddw+54YL1IZTLnCmP380nI0neh90sqFqMBN8SnmwGKfO4W
-T6/sosRr5ZQ+31FJW/BrguWbpLE79I71Un0+hjkCJbwPQaUrSBhVcy928VAvHLOL
-twdm6QPcFAtQORKRsTyBT6aXyImP9VHxQs+a0kM8gHvtwC2PkD5Ekag3hP5hHtV/
-Xc3mganw0UJOaWzEkhVhw5i2byDxfXPx6fd8lO6gowU2jV1LeT9j3kFQf1Jor2mT
-S2xTeCur771jFSMyCKjFrE5ePeTzyrUrJ4t9LB1ynocEXbWH63EobMYU5uW/UPaK
-svNZihHiX+xntJPDXK5w3pm9m4q4kJm3PXqXjXpN5G9LHliP9T+c/oCnf46iT4om
-yq2sWegsr+V7GfT4w44/1S/eMklf3fz2BbOCnk53aQDfqAmCBFLttddn0l1yWo8P
-e4saEpbu4W8uqaIjs7rZstKaxbTb4rbsHHORSc8Rvp12lmq0tdH1GnCJrkpluxYP
-2hn/6KgLQuPT1WkQeAkxrinlbuHk4MpqU8dglwhUnKVUbLIjYBpklGp+axxPAgMB
-AAGjLDAqMAkGA1UdEwQCMAAwHQYDVR0RBBYwFIISbXRscy5odHRwYmluLmxvY2Fs
-MA0GCSqGSIb3DQEBCwUAA4ICAQBrAYU/4+TDDD5qyeMoS/a86SRcd3+idphz8G2E
-8AAb7m+AGx6CDrmlloF8x7O3AHfmpgv8WZUx8gtVfC0hyWMUuoi98EA/5IdEVFTZ
-/4vpKtLrXtuUBlV1hiWOFpLlt6tOZW7jLJRemwZXvGvETvp6hJZwek5v/AU5Eq9E
-DCAjvs8uEOIWTflXanBe92tCGfhq6XzpRd3kQi/NZy7V3yCoqqXRLCz7rd9OtN32
-KBYAprIFJ75BlwoZ5e8AArVQ5InSfJEx/oLbymSitIjSJn+R7psofwEs6mXNGN5H
-ednGWq7l5bhp5mbYBEbwHmb9lOSfRtT7s4/SCgkJWTieU5klowF+RvSkjbbhOcaK
-x/DQJTrnayCQpaRQThLEkk91vxr70WnsSvO0PxZ6lYJN1m5xD5V6iid4OKHbqMf2
-yiYrma8Cdaf2ClQjrfgpNyXG9uB4j2uj9hSivsVTrKdhMdNID83O6ushcEhGufy9
-8ADLg7w6Oe6DNQufcegNFXaVX2AqN92MlGBLEJc1WwLk3q2Nac9gT1JbxgJdZeLv
-xoTwnu2/Tu1HVOUPemgG/0GwaePLFKxrhQWNIV69v17aj4QwnbbovQRKGtAP2fsk
-JY6zpF5d11iGwCSS3GnoIUKn7Xo4g/V5Xf5YcP2UPAGLGGxS+zE52mVemVpY9ZqS
-ZxAoPg==
------END CERTIFICATE-----
-`
+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
+PLApoDRtuZpYJBY4acuPqyBLs+xn0fZ5pmM=
+-----END CERTIFICATE-----`
- clientKey := `-----BEGIN PRIVATE KEY-----
-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
-yXwQ0N/qK7uMh9w0d+yac8h8bjMa
------END PRIVATE KEY-----
+ clientKey := `-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
`
suites := func(scaffoldFunc func() *scaffold.Scaffold) {
@@ -505,7 +500,9 @@ spec:
assert.Nil(ginkgo.GinkgoT(),
s.EnsureNumApisixRoutesCreated(1))
// Without Client Cert
-
s.NewAPISIXHttpsClient(host).GET("/ip").WithHeader("Host",
host).Expect().Status(http.StatusBadRequest).Body().Raw()
+ // From APISIX v2.14, If the client does not carry a
certificate request, it will fail directly.
+ // Previous versions would return 400.
+ //
s.NewAPISIXHttpsClient(host).GET("/ip").WithHeader("Host",
host).Expect().Status(http.StatusBadRequest).Body().Raw()
// With client cert
caCertPool := x509.NewCertPool()
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 c8b2261f..c77c6b6a 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()
