Skip to content

Commit 113defc

Browse files
tao12345666333tao12345666333
authored
chore: rename all v2beta3 to v2 in e2e templates (#1832)
Signed-off-by: Jintao Zhang <[email protected]>
1 parent 7b81a8b commit 113defc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+185
-185
lines changed

‎test/e2e/scaffold/upstream_tls.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
var (
2323
_apisixUpstreamsWithMTLSTemplate = `
24-
apiVersion: apisix.apache.org/v2beta3
24+
apiVersion: apisix.apache.org/v2
2525
kind: ApisixUpstream
2626
metadata:
2727
name: %s

‎test/e2e/suite-annotations/plugin_conifg.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
func _createAPC(s *scaffold.Scaffold) {
3030
apc := fmt.Sprintf(`
31-
apiVersion: apisix.apache.org/v2beta3
31+
apiVersion: apisix.apache.org/v2
3232
kind: ApisixPluginConfig
3333
metadata:
3434
name: echo-and-cors-apc

‎test/e2e/suite-chore/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ data:
4646
kubernetes:
4747
namespace_selector:
4848
- %s
49-
apisix_route_version: "apisix.apache.org/v2beta3"
49+
apisix_route_version: "apisix.apache.org/v2"
5050
watch_endpoint_slices: true
5151
`
5252
)

‎test/e2e/suite-chore/consistency.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
var (
3030
_routeConfig = `
31-
apiVersion: apisix.apache.org/v2beta3
31+
apiVersion: apisix.apache.org/v2
3232
kind: ApisixRoute
3333
metadata:
3434
name: httpbin-route

‎test/e2e/suite-chore/endpoints.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = ginkgo.Describe("suite-chore: endpoints", func() {
3030
ginkgo.It("ignore applied only if there is an ApisixRoute referenced", func() {
3131
backendSvc, backendSvcPort := s.DefaultHTTPBackend()
3232
ar := fmt.Sprintf(`
33-
apiVersion: apisix.apache.org/v2beta3
33+
apiVersion: apisix.apache.org/v2
3434
kind: ApisixRoute
3535
metadata:
3636
name: httpbin-route
@@ -56,7 +56,7 @@ spec:
5656
ginkgo.It("upstream nodes should be reset to empty when Service/Endpoints was deleted", func() {
5757
backendSvc, backendSvcPort := s.DefaultHTTPBackend()
5858
apisixRoute := fmt.Sprintf(`
59-
apiVersion: apisix.apache.org/v2beta3
59+
apiVersion: apisix.apache.org/v2
6060
kind: ApisixRoute
6161
metadata:
6262
name: httpbin-route
@@ -85,7 +85,7 @@ spec:
8585
ginkgo.It("when endpoint is 0, upstream nodes is also 0", func() {
8686
backendSvc, backendSvcPort := s.DefaultHTTPBackend()
8787
apisixRoute := fmt.Sprintf(`
88-
apiVersion: apisix.apache.org/v2beta3
88+
apiVersion: apisix.apache.org/v2
8989
kind: ApisixRoute
9090
metadata:
9191
name: httpbin-route

‎test/e2e/suite-cluster/apisix_cluster_config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var _ = ginkgo.Describe("suite-cluster: ApisixClusterConfig v2", func() {
4242
time.Sleep(3 * time.Second)
4343

4444
ar := fmt.Sprintf(`
45-
apiVersion: apisix.apache.org/v2beta3
45+
apiVersion: apisix.apache.org/v2
4646
kind: ApisixRoute
4747
metadata:
4848
name: default

‎test/e2e/suite-features/healthcheck.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var _ = ginkgo.Describe("suite-features: health check", func() {
3131
backendSvc, backendPorts := s.DefaultHTTPBackend()
3232

3333
au := fmt.Sprintf(`
34-
apiVersion: apisix.apache.org/v2beta3
34+
apiVersion: apisix.apache.org/v2
3535
kind: ApisixUpstream
3636
metadata:
3737
name: %s
@@ -51,7 +51,7 @@ spec:
5151
assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
5252

5353
ar := fmt.Sprintf(`
54-
apiVersion: apisix.apache.org/v2beta3
54+
apiVersion: apisix.apache.org/v2
5555
kind: ApisixRoute
5656
metadata:
5757
name: httpbin-route
@@ -88,7 +88,7 @@ spec:
8888
backendSvc, backendPorts := s.DefaultHTTPBackend()
8989

9090
au := fmt.Sprintf(`
91-
apiVersion: apisix.apache.org/v2beta3
91+
apiVersion: apisix.apache.org/v2
9292
kind: ApisixUpstream
9393
metadata:
9494
name: %s
@@ -113,7 +113,7 @@ spec:
113113
assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
114114

115115
ar := fmt.Sprintf(`
116-
apiVersion: apisix.apache.org/v2beta3
116+
apiVersion: apisix.apache.org/v2
117117
kind: ApisixRoute
118118
metadata:
119119
name: httpbin-route

‎test/e2e/suite-features/remote_addrs_match.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _ = ginkgo.Describe("suite-features: traffic split", func() {
3030
ginkgo.It("sanity", func() {
3131
backendSvc, backendPorts := s.DefaultHTTPBackend()
3232
ar := fmt.Sprintf(`
33-
apiVersion: apisix.apache.org/v2beta3
33+
apiVersion: apisix.apache.org/v2
3434
kind: ApisixRoute
3535
metadata:
3636
name: httpbin-route
@@ -60,7 +60,7 @@ spec:
6060
resp.Body().Contains("404 Route Not Found")
6161

6262
ar = fmt.Sprintf(`
63-
apiVersion: apisix.apache.org/v2beta3
63+
apiVersion: apisix.apache.org/v2
6464
kind: ApisixRoute
6565
metadata:
6666
name: httpbin-route

‎test/e2e/suite-features/retries.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var _ = ginkgo.Describe("suite-features: retries", func() {
2929
s := scaffoldFunc()
3030

3131
routeTpl := `
32-
apiVersion: apisix.apache.org/v2beta3
32+
apiVersion: apisix.apache.org/v2
3333
kind: ApisixRoute
3434
metadata:
3535
name: httpbin-route
@@ -53,7 +53,7 @@ spec:
5353
time.Sleep(5 * time.Second)
5454

5555
au := fmt.Sprintf(`
56-
apiVersion: apisix.apache.org/v2beta3
56+
apiVersion: apisix.apache.org/v2
5757
kind: ApisixUpstream
5858
metadata:
5959
name: %s
@@ -77,7 +77,7 @@ spec:
7777
time.Sleep(5 * time.Second)
7878

7979
au := fmt.Sprintf(`
80-
apiVersion: apisix.apache.org/v2beta3
80+
apiVersion: apisix.apache.org/v2
8181
kind: ApisixUpstream
8282
metadata:
8383
name: %s
@@ -102,7 +102,7 @@ spec:
102102
time.Sleep(5 * time.Second)
103103

104104
au := fmt.Sprintf(`
105-
apiVersion: apisix.apache.org/v2beta3
105+
apiVersion: apisix.apache.org/v2
106106
kind: ApisixUpstream
107107
metadata:
108108
name: %s
@@ -132,7 +132,7 @@ var _ = ginkgo.Describe("suite-features: retries timeout", func() {
132132
backendSvc, backendPorts := s.DefaultHTTPBackend()
133133

134134
au := fmt.Sprintf(`
135-
apiVersion: apisix.apache.org/v2beta3
135+
apiVersion: apisix.apache.org/v2
136136
kind: ApisixUpstream
137137
metadata:
138138
name: %s
@@ -146,7 +146,7 @@ spec:
146146
time.Sleep(2 * time.Second)
147147

148148
ar := fmt.Sprintf(`
149-
apiVersion: apisix.apache.org/v2beta3
149+
apiVersion: apisix.apache.org/v2
150150
kind: ApisixRoute
151151
metadata:
152152
name: httpbin-route

‎test/e2e/suite-features/route_match_exprs.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var _ = ginkgo.Describe("suite-features: route match exprs", func() {
3232
backendSvc, backendPorts := s.DefaultHTTPBackend()
3333

3434
ar := fmt.Sprintf(`
35-
apiVersion: apisix.apache.org/v2beta3
35+
apiVersion: apisix.apache.org/v2
3636
kind: ApisixRoute
3737
metadata:
3838
name: httpbin-route
@@ -83,7 +83,7 @@ spec:
8383
backendSvc, backendPorts := s.DefaultHTTPBackend()
8484

8585
ar := fmt.Sprintf(`
86-
apiVersion: apisix.apache.org/v2beta3
86+
apiVersion: apisix.apache.org/v2
8787
kind: ApisixRoute
8888
metadata:
8989
name: httpbin-route
@@ -132,7 +132,7 @@ spec:
132132
backendSvc, backendPorts := s.DefaultHTTPBackend()
133133

134134
ar := fmt.Sprintf(`
135-
apiVersion: apisix.apache.org/v2beta3
135+
apiVersion: apisix.apache.org/v2
136136
kind: ApisixRoute
137137
metadata:
138138
name: httpbin-route
@@ -256,7 +256,7 @@ spec:
256256
backendSvc, backendPorts := s.DefaultHTTPBackend()
257257

258258
ar := fmt.Sprintf(`
259-
apiVersion: apisix.apache.org/v2beta3
259+
apiVersion: apisix.apache.org/v2
260260
kind: ApisixRoute
261261
metadata:
262262
name: httpbin-route
@@ -380,7 +380,7 @@ spec:
380380
backendSvc, backendPorts := s.DefaultHTTPBackend()
381381

382382
ar := fmt.Sprintf(`
383-
apiVersion: apisix.apache.org/v2beta3
383+
apiVersion: apisix.apache.org/v2
384384
kind: ApisixRoute
385385
metadata:
386386
name: httpbin-route
@@ -438,7 +438,7 @@ spec:
438438
backendSvc, backendPorts := s.DefaultHTTPBackend()
439439

440440
ar := fmt.Sprintf(`
441-
apiVersion: apisix.apache.org/v2beta3
441+
apiVersion: apisix.apache.org/v2
442442
kind: ApisixRoute
443443
metadata:
444444
name: httpbin-route
@@ -495,7 +495,7 @@ spec:
495495
backendSvc, backendPorts := s.DefaultHTTPBackend()
496496

497497
ar := fmt.Sprintf(`
498-
apiVersion: apisix.apache.org/v2beta3
498+
apiVersion: apisix.apache.org/v2
499499
kind: ApisixRoute
500500
metadata:
501501
name: httpbin-route
@@ -554,7 +554,7 @@ spec:
554554
backendSvc, backendPorts := s.DefaultHTTPBackend()
555555

556556
ar := fmt.Sprintf(`
557-
apiVersion: apisix.apache.org/v2beta3
557+
apiVersion: apisix.apache.org/v2
558558
kind: ApisixRoute
559559
metadata:
560560
name: httpbin-route
@@ -612,7 +612,7 @@ spec:
612612
backendSvc, backendPorts := s.DefaultHTTPBackend()
613613

614614
ar := fmt.Sprintf(`
615-
apiVersion: apisix.apache.org/v2beta3
615+
apiVersion: apisix.apache.org/v2
616616
kind: ApisixRoute
617617
metadata:
618618
name: httpbin-route
@@ -671,7 +671,7 @@ spec:
671671
backendSvc, backendPorts := s.DefaultHTTPBackend()
672672

673673
ar := fmt.Sprintf(`
674-
apiVersion: apisix.apache.org/v2beta3
674+
apiVersion: apisix.apache.org/v2
675675
kind: ApisixRoute
676676
metadata:
677677
name: httpbin-route
@@ -737,7 +737,7 @@ var _ = ginkgo.Describe("suite-features: route match exprs bugfixes", func() {
737737
backendSvc, backendPorts := s.DefaultHTTPBackend()
738738

739739
ar := fmt.Sprintf(`
740-
apiVersion: apisix.apache.org/v2beta3
740+
apiVersion: apisix.apache.org/v2
741741
kind: ApisixRoute
742742
metadata:
743743
name: httpbin-route

‎test/e2e/suite-features/scheme.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
`)
5959
assert.Nil(ginkgo.GinkgoT(), err)
6060
assert.Nil(ginkgo.GinkgoT(), s.CreateVersionedApisixResource(`
61-
apiVersion: apisix.apache.org/v2beta3
61+
apiVersion: apisix.apache.org/v2
6262
kind: ApisixUpstream
6363
metadata:
6464
name: grpc-server-service
@@ -68,7 +68,7 @@ spec:
6868
scheme: grpc
6969
`))
7070
err = s.CreateVersionedApisixResource(`
71-
apiVersion: apisix.apache.org/v2beta3
71+
apiVersion: apisix.apache.org/v2
7272
kind: ApisixRoute
7373
metadata:
7474
name: grpc-route
@@ -130,7 +130,7 @@ spec:
130130
assert.NoError(ginkgo.GinkgoT(), err, "create server cert secret")
131131

132132
assert.NoError(ginkgo.GinkgoT(), s.CreateVersionedApisixResource(`
133-
apiVersion: apisix.apache.org/v2beta3
133+
apiVersion: apisix.apache.org/v2
134134
kind: ApisixUpstream
135135
metadata:
136136
name: test-backend-service-e2e-test
@@ -139,7 +139,7 @@ spec:
139139
`))
140140

141141
assert.NoError(ginkgo.GinkgoT(), s.CreateVersionedApisixResource(`
142-
apiVersion: apisix.apache.org/v2beta3
142+
apiVersion: apisix.apache.org/v2
143143
kind: ApisixRoute
144144
metadata:
145145
name: grpcs-route

‎test/e2e/suite-features/subset.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var _ = ginkgo.Describe("suite-features: service subset", func() {
3333
assert.Nil(ginkgo.GinkgoT(), s.WaitAllHTTPBINPodsAvailable(), "waiting for all httpbin pods ready")
3434
backendSvc, backendSvcPort := s.DefaultHTTPBackend()
3535
ar := fmt.Sprintf(`
36-
apiVersion: apisix.apache.org/v2beta3
36+
apiVersion: apisix.apache.org/v2
3737
kind: ApisixRoute
3838
metadata:
3939
name: httpbin-route
@@ -67,7 +67,7 @@ spec:
6767
ginkgo.It("subset with bad labels", func() {
6868
backendSvc, backendSvcPort := s.DefaultHTTPBackend()
6969
au := fmt.Sprintf(`
70-
apiVersion: apisix.apache.org/v2beta3
70+
apiVersion: apisix.apache.org/v2
7171
kind: ApisixUpstream
7272
metadata:
7373
name: %s
@@ -82,7 +82,7 @@ spec:
8282
assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
8383
time.Sleep(1 * time.Second)
8484
ar := fmt.Sprintf(`
85-
apiVersion: apisix.apache.org/v2beta3
85+
apiVersion: apisix.apache.org/v2
8686
kind: ApisixRoute
8787
metadata:
8888
name: httpbin-route
@@ -119,7 +119,7 @@ spec:
119119

120120
backendSvc, backendSvcPort := s.DefaultHTTPBackend()
121121
au := fmt.Sprintf(`
122-
apiVersion: apisix.apache.org/v2beta3
122+
apiVersion: apisix.apache.org/v2
123123
kind: ApisixUpstream
124124
metadata:
125125
name: %s
@@ -133,7 +133,7 @@ spec:
133133
assert.Nil(ginkgo.GinkgoT(), err, "create ApisixUpstream")
134134
time.Sleep(1 * time.Second)
135135
ar := fmt.Sprintf(`
136-
apiVersion: apisix.apache.org/v2beta3
136+
apiVersion: apisix.apache.org/v2
137137
kind: ApisixRoute
138138
metadata:
139139
name: httpbin-route

‎test/e2e/suite-features/sync-comparison.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var _ = ginkgo.Describe("suite-features: sync comparison", func() {
3333
ginkgo.It("check resource request count", func() {
3434
backendSvc, backendSvcPort := s.DefaultHTTPBackend()
3535
ar := fmt.Sprintf(`
36-
apiVersion: apisix.apache.org/v2beta3
36+
apiVersion: apisix.apache.org/v2
3737
kind: ApisixRoute
3838
metadata:
3939
name: httpbin-route
@@ -54,7 +54,7 @@ spec:
5454
assert.Nil(ginkgo.GinkgoT(), err, "checking number of upstreams")
5555

5656
arStream := fmt.Sprintf(`
57-
apiVersion: apisix.apache.org/v2beta3
57+
apiVersion: apisix.apache.org/v2
5858
kind: ApisixRoute
5959
metadata:
6060
name: httpbin-tcp-route
@@ -80,7 +80,7 @@ spec:
8080
assert.Nil(ginkgo.GinkgoT(), err, "create ApisixTls 'a' error")
8181

8282
ac := `
83-
apiVersion: apisix.apache.org/v2beta3
83+
apiVersion: apisix.apache.org/v2
8484
kind: ApisixConsumer
8585
metadata:
8686
name: foo
@@ -107,7 +107,7 @@ spec:
107107
assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(agr), "create ApisixGlobalRule")
108108

109109
apc := fmt.Sprintf(`
110-
apiVersion: apisix.apache.org/v2beta3
110+
apiVersion: apisix.apache.org/v2
111111
kind: ApisixPluginConfig
112112
metadata:
113113
name: test-apc-1

0 commit comments

Comments
 (0)