chore: rename all v2beta3 to v2 in e2e templates (#1832)

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
apache · May 16, 2023 · 113defc · 113defc
1 parent 7b81a8b
commit 113defc
Show file tree

Hide file tree

Showing 48 changed files with 185 additions and 185 deletions.
diff --git a/test/e2e/scaffold/upstream_tls.go b/test/e2e/scaffold/upstream_tls.go
@@ -21,7 +21,7 @@ import (
 
 var (
 	_apisixUpstreamsWithMTLSTemplate = `
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s

diff --git a/test/e2e/suite-annotations/plugin_conifg.go b/test/e2e/suite-annotations/plugin_conifg.go
@@ -28,7 +28,7 @@ import (
 
 func _createAPC(s *scaffold.Scaffold) {
 	apc := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixPluginConfig
 metadata:
   name: echo-and-cors-apc

diff --git a/test/e2e/suite-chore/config.go b/test/e2e/suite-chore/config.go
@@ -46,7 +46,7 @@ data:
     kubernetes:
       namespace_selector:
       - %s
-      apisix_route_version: "apisix.apache.org/v2beta3"
+      apisix_route_version: "apisix.apache.org/v2"
       watch_endpoint_slices: true
 `
 )

diff --git a/test/e2e/suite-chore/consistency.go b/test/e2e/suite-chore/consistency.go
@@ -28,7 +28,7 @@ import (
 
 var (
 	_routeConfig = `
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route

diff --git a/test/e2e/suite-chore/endpoints.go b/test/e2e/suite-chore/endpoints.go
@@ -30,7 +30,7 @@ var _ = ginkgo.Describe("suite-chore: endpoints", func() {
 		ginkgo.It("ignore applied only if there is an ApisixRoute referenced", func() {
 			backendSvc, backendSvcPort := s.DefaultHTTPBackend()
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: httpbin-route
@@ -56,7 +56,7 @@ spec:
 		ginkgo.It("upstream nodes should be reset to empty when Service/Endpoints was deleted", func() {
 			backendSvc, backendSvcPort := s.DefaultHTTPBackend()
 			apisixRoute := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -85,7 +85,7 @@ spec:
 		ginkgo.It("when endpoint is 0, upstream nodes is also 0", func() {
 			backendSvc, backendSvcPort := s.DefaultHTTPBackend()
 			apisixRoute := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route

diff --git a/test/e2e/suite-cluster/apisix_cluster_config.go b/test/e2e/suite-cluster/apisix_cluster_config.go
@@ -42,7 +42,7 @@ var _ = ginkgo.Describe("suite-cluster: ApisixClusterConfig v2", func() {
 			time.Sleep(3 * time.Second)
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: default

diff --git a/test/e2e/suite-features/healthcheck.go b/test/e2e/suite-features/healthcheck.go
@@ -31,7 +31,7 @@ var _ = ginkgo.Describe("suite-features: health check", func() {
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -51,7 +51,7 @@ spec:
 			assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -88,7 +88,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -113,7 +113,7 @@ spec:
 			assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route

diff --git a/test/e2e/suite-features/remote_addrs_match.go b/test/e2e/suite-features/remote_addrs_match.go
@@ -30,7 +30,7 @@ var _ = ginkgo.Describe("suite-features: traffic split", func() {
 		ginkgo.It("sanity", func() {
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -60,7 +60,7 @@ spec:
 			resp.Body().Contains("404 Route Not Found")
 
 			ar = fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route

diff --git a/test/e2e/suite-features/retries.go b/test/e2e/suite-features/retries.go
@@ -29,7 +29,7 @@ var _ = ginkgo.Describe("suite-features: retries", func() {
 		s := scaffoldFunc()
 
 		routeTpl := `
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: httpbin-route
@@ -53,7 +53,7 @@ spec:
 			time.Sleep(5 * time.Second)
 
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -77,7 +77,7 @@ spec:
 			time.Sleep(5 * time.Second)
 
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -102,7 +102,7 @@ spec:
 			time.Sleep(5 * time.Second)
 
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -132,7 +132,7 @@ var _ = ginkgo.Describe("suite-features: retries timeout", func() {
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -146,7 +146,7 @@ spec:
 			time.Sleep(2 * time.Second)
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route

diff --git a/test/e2e/suite-features/route_match_exprs.go b/test/e2e/suite-features/route_match_exprs.go
@@ -32,7 +32,7 @@ var _ = ginkgo.Describe("suite-features: route match exprs", func() {
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -83,7 +83,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -132,7 +132,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -256,7 +256,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -380,7 +380,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -438,7 +438,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -495,7 +495,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -554,7 +554,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -612,7 +612,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -671,7 +671,7 @@ spec:
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route
@@ -737,7 +737,7 @@ var _ = ginkgo.Describe("suite-features: route match exprs bugfixes", func() {
 			backendSvc, backendPorts := s.DefaultHTTPBackend()
 
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: httpbin-route

diff --git a/test/e2e/suite-features/scheme.go b/test/e2e/suite-features/scheme.go
@@ -58,7 +58,7 @@ spec:
 `)
 			assert.Nil(ginkgo.GinkgoT(), err)
 			assert.Nil(ginkgo.GinkgoT(), s.CreateVersionedApisixResource(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: grpc-server-service
@@ -68,7 +68,7 @@ spec:
       scheme: grpc
 `))
 			err = s.CreateVersionedApisixResource(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: grpc-route
@@ -130,7 +130,7 @@ spec:
 			assert.NoError(ginkgo.GinkgoT(), err, "create server cert secret")
 
 			assert.NoError(ginkgo.GinkgoT(), s.CreateVersionedApisixResource(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: test-backend-service-e2e-test
@@ -139,7 +139,7 @@ spec:
 `))
 
 			assert.NoError(ginkgo.GinkgoT(), s.CreateVersionedApisixResource(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
  name: grpcs-route

diff --git a/test/e2e/suite-features/subset.go b/test/e2e/suite-features/subset.go
@@ -33,7 +33,7 @@ var _ = ginkgo.Describe("suite-features: service subset", func() {
 			assert.Nil(ginkgo.GinkgoT(), s.WaitAllHTTPBINPodsAvailable(), "waiting for all httpbin pods ready")
 			backendSvc, backendSvcPort := s.DefaultHTTPBackend()
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: httpbin-route
@@ -67,7 +67,7 @@ spec:
 		ginkgo.It("subset with bad labels", func() {
 			backendSvc, backendSvcPort := s.DefaultHTTPBackend()
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -82,7 +82,7 @@ spec:
 			assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
 			time.Sleep(1 * time.Second)
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: httpbin-route
@@ -119,7 +119,7 @@ spec:
 
 			backendSvc, backendSvcPort := s.DefaultHTTPBackend()
 			au := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
@@ -133,7 +133,7 @@ spec:
 			assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
 			time.Sleep(1 * time.Second)
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: httpbin-route

diff --git a/test/e2e/suite-features/sync-comparison.go b/test/e2e/suite-features/sync-comparison.go
@@ -33,7 +33,7 @@ var _ = ginkgo.Describe("suite-features: sync comparison", func() {
 		ginkgo.It("check resource request count", func() {
 			backendSvc, backendSvcPort := s.DefaultHTTPBackend()
 			ar := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: httpbin-route
@@ -54,7 +54,7 @@ spec:
 			assert.Nil(ginkgo.GinkgoT(), err, "checking number of upstreams")
 
 			arStream := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixRoute
 metadata:
   name: httpbin-tcp-route
@@ -80,7 +80,7 @@ spec:
 			assert.Nil(ginkgo.GinkgoT(), err, "create ApisixTls 'a' error")
 
 			ac := `
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixConsumer
 metadata:
   name: foo
@@ -107,7 +107,7 @@ spec:
 			assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(agr), "create ApisixGlobalRule")
 
 			apc := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixPluginConfig
 metadata:
  name: test-apc-1