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 cccad72a chore: mark v2beta3 deprecated (#1198)
cccad72a is described below
commit cccad72a1e0ef60525c69371b4b27c4598c587c1
Author: Jintao Zhang <[email protected]>
AuthorDate: Fri Jul 29 19:18:23 2022 +0800
chore: mark v2beta3 deprecated (#1198)
---
cmd/ingress/ingress.go | 1 +
cmd/ingress/testdata/conf.json | 13 -------------
cmd/ingress/testdata/config | 19 -------------------
conf/config-default.yaml | 6 +++---
pkg/config/config.go | 2 +-
pkg/config/config_test.go | 2 +-
test/e2e/scaffold/scaffold.go | 2 +-
test/e2e/suite-annotations/authorization.go | 2 +-
test/e2e/suite-chore/endpoints.go | 2 +-
test/e2e/suite-features/global_rule.go | 2 +-
test/e2e/suite-features/healthcheck.go | 2 +-
test/e2e/suite-features/remote_addrs_match.go | 2 +-
test/e2e/suite-features/retries.go | 4 ++--
test/e2e/suite-features/route_match_exprs.go | 4 ++--
test/e2e/suite-features/scheme.go | 2 +-
test/e2e/suite-features/subset.go | 2 +-
test/e2e/suite-features/traffic_split.go | 2 +-
test/e2e/suite-features/websocket.go | 2 +-
.../suite-ingress/suite-ingress-features/compare.go | 2 +-
.../suite-ingress/suite-ingress-features/sanity.go | 6 +++---
.../suite-ingress/suite-ingress-features/secret.go | 2 +-
.../suite-ingress/suite-ingress-features/status.go | 2 +-
.../suite-ingress-resource/resourcepushing.go | 2 +-
test/e2e/suite-ingress/suite-ingress-resource/ssl.go | 4 ++--
.../suite-ingress/suite-ingress-resource/stream.go | 2 +-
.../suite-ingress-resource/upstream_tls.go | 2 +-
.../suite-plugins-authentication/basic.go | 2 +-
.../suite-plugins-authentication/hmac.go | 2 +-
.../suite-plugins/suite-plugins-authentication/jwt.go | 2 +-
.../suite-plugins/suite-plugins-authentication/key.go | 2 +-
.../suite-plugins-authentication/wolfrbac.go | 2 +-
test/e2e/suite-plugins/suite-plugins-general/echo.go | 2 +-
.../suite-plugins/suite-plugins-general/redirect.go | 2 +-
.../suite-plugins-other/plugin_config.go | 2 +-
.../suite-plugins/suite-plugins-other/serverless.go | 2 +-
.../suite-plugins-security/consumer-restriction.go | 2 +-
test/e2e/suite-plugins/suite-plugins-security/cors.go | 2 +-
test/e2e/suite-plugins/suite-plugins-security/csrf.go | 2 +-
.../suite-plugins-security/ip-restriction.go | 2 +-
.../suite-plugins-security/referer-restriction.go | 2 +-
.../suite-plugins-security/uri_blocker.go | 2 +-
.../suite-plugins-traffic/api_breaker.go | 2 +-
.../suite-plugins-traffic/client-control.go | 2 +-
.../suite-plugins-traffic/limit_count.go | 2 +-
.../suite-plugins-traffic/request-validation.go | 2 +-
.../suite-plugins/suite-plugins-traffic/request_id.go | 2 +-
.../suite-plugins-transformation/fault_injection.go | 2 +-
.../suite-plugins-transformation/proxy_rewrite.go | 2 +-
.../suite-plugins-transformation/response_rewrite.go | 2 +-
49 files changed, 54 insertions(+), 85 deletions(-)
diff --git a/cmd/ingress/ingress.go b/cmd/ingress/ingress.go
index ce5e91ab..dcbb7264 100644
--- a/cmd/ingress/ingress.go
+++ b/cmd/ingress/ingress.go
@@ -162,6 +162,7 @@ For example, no available LB exists in the bare metal
environment.`)
cmd.PersistentFlags().StringVar(&cfg.Kubernetes.ElectionID,
"election-id", config.IngressAPISIXLeader, "election id used for campaign the
controller leader")
cmd.PersistentFlags().StringVar(&cfg.Kubernetes.IngressVersion,
"ingress-version", config.IngressNetworkingV1, "the supported ingress api group
version, can be \"networking/v1beta1\", \"networking/v1\" (for Kubernetes
version v1.19.0 or higher) and \"extensions/v1beta1\"")
cmd.PersistentFlags().StringVar(&cfg.Kubernetes.ApisixRouteVersion,
"apisix-route-version", config.DefaultAPIVersion, "the supported apisixroute
api group version, can be \"apisix.apache.org/v2beta2\" or
\"apisix.apache.org/v2beta3\" or \"apisix.apache.org/v2\"")
+ _ = cmd.PersistentFlags().MarkDeprecated("apisix-route-version", "will
be removed in the next version, please use --api-version instead")
cmd.PersistentFlags().StringVar(&cfg.Kubernetes.APIVersion,
"api-version", config.DefaultAPIVersion, config.APIVersionDescribe)
cmd.PersistentFlags().BoolVar(&cfg.Kubernetes.WatchEndpointSlices,
"watch-endpointslices", false, "whether to watch endpointslices rather than
endpoints")
cmd.PersistentFlags().BoolVar(&cfg.Kubernetes.EnableGatewayAPI,
"enable-gateway-api", false, "whether to enable support for Gateway API")
diff --git a/cmd/ingress/testdata/conf.json b/cmd/ingress/testdata/conf.json
deleted file mode 100644
index c285d676..00000000
--- a/cmd/ingress/testdata/conf.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "conf":{
- "k8sAuth":{
- "file": "./testdata/config"
- },
- "syslog":{
- "host": "localhost"
- },
- "apisix":{
- "base_url": "http://172.16.20.90:30116/apisix/admin";
- }
- }
-}
diff --git a/cmd/ingress/testdata/config b/cmd/ingress/testdata/config
deleted file mode 100644
index 8927a39b..00000000
--- a/cmd/ingress/testdata/config
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-clusters:
-- cluster:
- certificate-authority-data:
LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1UQXlPREV3TlRNek5sb1hEVEk1TVRBeU5URXdOVE16Tmxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTjNUCkVidWVaVDE5bEd4WXljMXRKcmZDdHRTRHQ0bzBoSUsrVHBaSzVWTGRBaVVkQ3hvQnhPMXhKYjBRM1NJcFRqd24Kd1VvdjhtUWhIQTJPc056MyttMkFWZnkveTlvbUlxeTVnT0hmeXM5eDQxOExKNGlhdy9vZXlMVFND
[...]
- server: https://172.16.20.90:6443
- name: kubernetes
-contexts:
-- context:
- cluster: kubernetes
- user: kubernetes-admin
- name: kubernetes-admin@kubernetes
-current-context: kubernetes-admin@kubernetes
-kind: Config
-preferences: {}
-users:
-- name: kubernetes-admin
- user:
- client-certificate-data:
LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJT0FNV2lqRlpwNEV3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RFd01qZ3hNRFV6TXpaYUZ3MHlNREV3TWpjeE1EVXpNemxhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTEvRGUrWVFGS2pKZUJQQTIKQzJVWFA0MWo0YW9DeXBVVFhWK004aXZacWZFQWw5c085alQyR3puaWVaRWQ1UFlRN2FrYzhSSlp4Sk5
[...]
- client-key-data:
LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBMS9EZStZUUZLakplQlBBMkMyVVhQNDFqNGFvQ3lwVVRYVitNOGl2WnFmRUFsOXNPCjlqVDJHem5pZVpFZDVQWVE3YWtjOFJKWnhKTk9FZ0orM3hVRlhGVnJ2akVYdnBEWFRxQVpNTVNUWlZvNkcvWkkKczF2UVR6U3NLMGVuam1PS0hOSDA2VW04K0NSUHl6YjNObllSTDFnTjRLRU4xblJVYXBKZ1dsbXpMRHZMcExRRQowUWwvajZ1MmxuYngvM3MxWFQwaDVmMkt0ckNleExXeXNMaXVjcVRqMGN5M3B3cDNZcmVlQkxVNzUwUE9ZZE42CmxWcENCbVZnRTM0V213d3lzTjVZV2VqZGZsdGEwZTVneHEreC8zMDViUFBDM2RWclhxVmpMUWpZQXJUbnZ
[...]
diff --git a/conf/config-default.yaml b/conf/config-default.yaml
index 13025af3..a91aa3e8 100644
--- a/conf/config-default.yaml
+++ b/conf/config-default.yaml
@@ -70,14 +70,14 @@ kubernetes:
# "extensions/v1beta1", default is
"networking/v1".
watch_endpointslices: false # whether to watch EndpointSlices
rather than Endpoints.
- apisix_route_version: "apisix.apache.org/v2beta3" # the supported
apisixroute api group version.
- # the latest version is
"apisix.apache.org/v2beta3".
+ apisix_route_version: "apisix.apache.org/v2" # the supported apisixroute
api group version.
+ # the latest version is
"apisix.apache.org/v2".
enable_gateway_api: false # whether to enable support for Gateway
API.
# Note: This feature is currently under
development and may not work as expected.
# It is not recommended to use it in a
production environment.
# Before we announce support for it to
reach Beta level or GA.
- api_version: apisix.apache.org/v2beta3 # the default value of API version is
"apisix.apache.org/v2beta3", support "apisix.apache.org/v2beta3" and
"apisix.apache.org/v2".
+ api_version: apisix.apache.org/v2 # the default value of API version is
"apisix.apache.org/v2", support "apisix.apache.org/v2beta3" and
"apisix.apache.org/v2".
# APISIX related configurations.
apisix:
diff --git a/pkg/config/config.go b/pkg/config/config.go
index aa6b0f75..04bb64bf 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -58,7 +58,7 @@ const (
// ApisixV2 represents apisix.apache.org/v2
ApisixV2 = "apisix.apache.org/v2"
// DefaultAPIVersion refers to the default resource version
- DefaultAPIVersion = ApisixV2beta3
+ DefaultAPIVersion = ApisixV2
_minimalResyncInterval = 30 * time.Second
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
index 0a24e4ae..9c305c7c 100644
--- a/pkg/config/config_test.go
+++ b/pkg/config/config_test.go
@@ -91,7 +91,7 @@ kubernetes:
election_id: my-election-id
ingress_class: apisix
ingress_version: networking/v1
- api_version: apisix.apache.org/v2beta3
+ api_version: apisix.apache.org/v2
apisix:
default_cluster_base_url: http://127.0.0.1:8080/apisix
default_cluster_admin_key: "123456"
diff --git a/test/e2e/scaffold/scaffold.go b/test/e2e/scaffold/scaffold.go
index 6681a95d..b2b2e4c0 100644
--- a/test/e2e/scaffold/scaffold.go
+++ b/test/e2e/scaffold/scaffold.go
@@ -157,7 +157,7 @@ func NewScaffold(o *Options) *Scaffold {
}
// NewDefaultScaffold creates a scaffold with some default options.
-// apisix-version default v2beta3
+// apisix-version default v2
func NewDefaultScaffold() *Scaffold {
opts := &Options{
Name: "default",
diff --git a/test/e2e/suite-annotations/authorization.go
b/test/e2e/suite-annotations/authorization.go
index bdae885e..c2961437 100644
--- a/test/e2e/suite-annotations/authorization.go
+++ b/test/e2e/suite-annotations/authorization.go
@@ -311,7 +311,7 @@ spec:
}
ginkgo.Describe("suite-annotations: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-annotations: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-chore/endpoints.go
b/test/e2e/suite-chore/endpoints.go
index 3ae145fe..2c593fee 100644
--- a/test/e2e/suite-chore/endpoints.go
+++ b/test/e2e/suite-chore/endpoints.go
@@ -112,7 +112,7 @@ spec:
})
}
ginkgo.Describe("suite-chore: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-chore: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
diff --git a/test/e2e/suite-features/global_rule.go
b/test/e2e/suite-features/global_rule.go
index 56858020..27deb6cf 100644
--- a/test/e2e/suite-features/global_rule.go
+++ b/test/e2e/suite-features/global_rule.go
@@ -82,7 +82,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/healthcheck.go
b/test/e2e/suite-features/healthcheck.go
index e99d917b..e6c26a01 100644
--- a/test/e2e/suite-features/healthcheck.go
+++ b/test/e2e/suite-features/healthcheck.go
@@ -144,7 +144,7 @@ spec:
})
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/remote_addrs_match.go
b/test/e2e/suite-features/remote_addrs_match.go
index fa727ce8..654146ed 100644
--- a/test/e2e/suite-features/remote_addrs_match.go
+++ b/test/e2e/suite-features/remote_addrs_match.go
@@ -93,7 +93,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/retries.go
b/test/e2e/suite-features/retries.go
index 2aca288a..02832cbf 100644
--- a/test/e2e/suite-features/retries.go
+++ b/test/e2e/suite-features/retries.go
@@ -121,7 +121,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
@@ -179,7 +179,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/route_match_exprs.go
b/test/e2e/suite-features/route_match_exprs.go
index 90900b72..76309c29 100644
--- a/test/e2e/suite-features/route_match_exprs.go
+++ b/test/e2e/suite-features/route_match_exprs.go
@@ -596,7 +596,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
@@ -677,7 +677,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/scheme.go
b/test/e2e/suite-features/scheme.go
index 499a8d1b..9dc11488 100644
--- a/test/e2e/suite-features/scheme.go
+++ b/test/e2e/suite-features/scheme.go
@@ -171,7 +171,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/subset.go
b/test/e2e/suite-features/subset.go
index c5e664c5..54806ecf 100644
--- a/test/e2e/suite-features/subset.go
+++ b/test/e2e/suite-features/subset.go
@@ -167,7 +167,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/traffic_split.go
b/test/e2e/suite-features/traffic_split.go
index 698596b5..6cbfea47 100644
--- a/test/e2e/suite-features/traffic_split.go
+++ b/test/e2e/suite-features/traffic_split.go
@@ -143,7 +143,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-features/websocket.go
b/test/e2e/suite-features/websocket.go
index e7bc4a83..174cefd3 100644
--- a/test/e2e/suite-features/websocket.go
+++ b/test/e2e/suite-features/websocket.go
@@ -112,7 +112,7 @@ spec:
}
ginkgo.Describe("suite-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-ingress/suite-ingress-features/compare.go
b/test/e2e/suite-ingress/suite-ingress-features/compare.go
index 11a94605..20edda04 100644
--- a/test/e2e/suite-ingress/suite-ingress-features/compare.go
+++ b/test/e2e/suite-ingress/suite-ingress-features/compare.go
@@ -67,7 +67,7 @@ spec:
}
ginkgo.Describe("suite-ingress-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-ingress-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-ingress/suite-ingress-features/sanity.go
b/test/e2e/suite-ingress/suite-ingress-features/sanity.go
index abdcb031..23376394 100644
--- a/test/e2e/suite-ingress/suite-ingress-features/sanity.go
+++ b/test/e2e/suite-ingress/suite-ingress-features/sanity.go
@@ -70,7 +70,7 @@ spec:
}
ginkgo.Describe("suite-ingress-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-ingress-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
@@ -128,7 +128,7 @@ spec:
}
ginkgo.Describe("suite-ingress-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-ingress-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
@@ -240,7 +240,7 @@ spec:
}
ginkgo.Describe("suite-ingress-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-ingress-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
diff --git a/test/e2e/suite-ingress/suite-ingress-features/secret.go
b/test/e2e/suite-ingress/suite-ingress-features/secret.go
index 107c3f50..2e9a73e4 100644
--- a/test/e2e/suite-ingress/suite-ingress-features/secret.go
+++ b/test/e2e/suite-ingress/suite-ingress-features/secret.go
@@ -497,7 +497,7 @@
UnBVSIGJ/c0AhVSDuOAJiF36pvsDysTZXMTFE/9i5bkGOiwtzRNe4Hym/SEZUCpn
}
ginkgo.Describe("suite-ingress-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-ingress-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
diff --git a/test/e2e/suite-ingress/suite-ingress-features/status.go
b/test/e2e/suite-ingress/suite-ingress-features/status.go
index 79c438f7..d340fbe2 100644
--- a/test/e2e/suite-ingress/suite-ingress-features/status.go
+++ b/test/e2e/suite-ingress/suite-ingress-features/status.go
@@ -65,7 +65,7 @@ spec:
}
ginkgo.Describe("suite-ingress-features: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-ingress-features: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
diff --git a/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go
b/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go
index 639cfcd0..8d15575c 100644
--- a/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go
+++ b/test/e2e/suite-ingress/suite-ingress-resource/resourcepushing.go
@@ -675,7 +675,7 @@ spec:
}
ginkgo.Describe("suite-ingress-resource: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-ingress-resource: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-ingress/suite-ingress-resource/ssl.go
b/test/e2e/suite-ingress/suite-ingress-resource/ssl.go
index 4e618ba6..cb07afee 100644
--- a/test/e2e/suite-ingress/suite-ingress-resource/ssl.go
+++ b/test/e2e/suite-ingress/suite-ingress-resource/ssl.go
@@ -236,7 +236,7 @@
RU+QPRECgYB6XW24EI5+w3STbpnc6VoTS+sy9I9abTJPYo9LpCJwfMYc9Tg9Cx2K
}
ginkgo.Describe("suite-ingress-resource: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-ingress-resource: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
@@ -518,7 +518,7 @@ spec:
}
ginkgo.Describe("suite-ingress-resource: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-ingress-resource: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-ingress/suite-ingress-resource/stream.go
b/test/e2e/suite-ingress/suite-ingress-resource/stream.go
index be97e2c0..aa3d9bc3 100644
--- a/test/e2e/suite-ingress/suite-ingress-resource/stream.go
+++ b/test/e2e/suite-ingress/suite-ingress-resource/stream.go
@@ -144,7 +144,7 @@ spec:
})
}
ginkgo.Describe("suite-ingress-resource: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-ingress-resource: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
diff --git a/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go
b/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go
index f4be864f..32a1ca89 100644
--- a/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go
+++ b/test/e2e/suite-ingress/suite-ingress-resource/upstream_tls.go
@@ -124,7 +124,7 @@ spec:
}
ginkgo.Describe("suite-ingress-resource: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold())
+ suites(scaffold.NewDefaultV2beta3Scaffold())
})
ginkgo.Describe("suite-ingress-resource: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold())
diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/basic.go
b/test/e2e/suite-plugins/suite-plugins-authentication/basic.go
index 9189c566..90cc2b34 100644
--- a/test/e2e/suite-plugins/suite-plugins-authentication/basic.go
+++ b/test/e2e/suite-plugins/suite-plugins-authentication/basic.go
@@ -189,7 +189,7 @@ spec:
}
ginkgo.Describe("suite-plugins-authentication: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-authentication: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go
b/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go
index c8d070d8..1e10803a 100644
--- a/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go
+++ b/test/e2e/suite-plugins/suite-plugins-authentication/hmac.go
@@ -233,7 +233,7 @@ spec:
}
ginkgo.Describe("suite-plugins-authentication: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-authentication: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go
b/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go
index ed15b534..3b8f6bc8 100644
--- a/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go
+++ b/test/e2e/suite-plugins/suite-plugins-authentication/jwt.go
@@ -231,7 +231,7 @@ spec:
}
ginkgo.Describe("suite-plugins-authentication: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-authentication: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/key.go
b/test/e2e/suite-plugins/suite-plugins-authentication/key.go
index 41b00bcf..cf11e57b 100644
--- a/test/e2e/suite-plugins/suite-plugins-authentication/key.go
+++ b/test/e2e/suite-plugins/suite-plugins-authentication/key.go
@@ -186,7 +186,7 @@ spec:
}
ginkgo.Describe("suite-plugins-authentication: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-authentication: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go
b/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go
index ae7b887d..b1bfd8d1 100644
--- a/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go
+++ b/test/e2e/suite-plugins/suite-plugins-authentication/wolfrbac.go
@@ -287,7 +287,7 @@ spec:
}
ginkgo.Describe("suite-plugins-authentication: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-authentication: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-general/echo.go
b/test/e2e/suite-plugins/suite-plugins-general/echo.go
index ad0b73a7..b807b740 100644
--- a/test/e2e/suite-plugins/suite-plugins-general/echo.go
+++ b/test/e2e/suite-plugins/suite-plugins-general/echo.go
@@ -226,7 +226,7 @@ spec:
}
ginkgo.Describe("suite-plugins-general: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-general: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-general/redirect.go
b/test/e2e/suite-plugins/suite-plugins-general/redirect.go
index c77c6b6a..7962dabb 100644
--- a/test/e2e/suite-plugins/suite-plugins-general/redirect.go
+++ b/test/e2e/suite-plugins/suite-plugins-general/redirect.go
@@ -211,7 +211,7 @@ spec:
}
ginkgo.Describe("suite-plugins-general: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-general: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go
b/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go
index 7d3c2967..d38a49cc 100644
--- a/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go
+++ b/test/e2e/suite-plugins/suite-plugins-other/plugin_config.go
@@ -535,7 +535,7 @@ spec:
}
ginkgo.Describe("suite-plugins-other: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-other: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-other/serverless.go
b/test/e2e/suite-plugins/suite-plugins-other/serverless.go
index 7ee87c36..0940bddd 100644
--- a/test/e2e/suite-plugins/suite-plugins-other/serverless.go
+++ b/test/e2e/suite-plugins/suite-plugins-other/serverless.go
@@ -94,7 +94,7 @@ spec:
}
ginkgo.Describe("suite-plugins-other: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-other: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git
a/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go
b/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go
index c0c09d70..5264cdf9 100644
--- a/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go
+++ b/test/e2e/suite-plugins/suite-plugins-security/consumer-restriction.go
@@ -223,7 +223,7 @@ spec:
}
ginkgo.Describe("suite-plugins-security: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-security: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-security/cors.go
b/test/e2e/suite-plugins/suite-plugins-security/cors.go
index b13bfbf6..9f8c4e08 100644
--- a/test/e2e/suite-plugins/suite-plugins-security/cors.go
+++ b/test/e2e/suite-plugins/suite-plugins-security/cors.go
@@ -327,7 +327,7 @@ spec:
}
ginkgo.Describe("suite-plugins-security: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-security: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-security/csrf.go
b/test/e2e/suite-plugins/suite-plugins-security/csrf.go
index 8af82f83..12854670 100644
--- a/test/e2e/suite-plugins/suite-plugins-security/csrf.go
+++ b/test/e2e/suite-plugins/suite-plugins-security/csrf.go
@@ -134,7 +134,7 @@ spec:
}
ginkgo.Describe("suite-plugins-security: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-security: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go
b/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go
index 5d3f5e4d..caa2ef77 100644
--- a/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go
+++ b/test/e2e/suite-plugins/suite-plugins-security/ip-restriction.go
@@ -230,7 +230,7 @@ spec:
}
ginkgo.Describe("suite-plugins-security: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-security: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git
a/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go
b/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go
index 4597a077..3b526784 100644
--- a/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go
+++ b/test/e2e/suite-plugins/suite-plugins-security/referer-restriction.go
@@ -312,7 +312,7 @@ spec:
}
ginkgo.Describe("suite-plugins-security: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-security: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go
b/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go
index 2056c2ed..0eb7d865 100644
--- a/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go
+++ b/test/e2e/suite-plugins/suite-plugins-security/uri_blocker.go
@@ -236,7 +236,7 @@ spec:
}
ginkgo.Describe("suite-plugins-security: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-security: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go
b/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go
index 9f8fc629..2596fa8d 100644
--- a/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go
+++ b/test/e2e/suite-plugins/suite-plugins-traffic/api_breaker.go
@@ -141,7 +141,7 @@ spec:
}
ginkgo.Describe("suite-plugins-traffic: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-traffic: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go
b/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go
index 03589bc4..3de80141 100644
--- a/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go
+++ b/test/e2e/suite-plugins/suite-plugins-traffic/client-control.go
@@ -124,7 +124,7 @@ spec:
}
ginkgo.Describe("suite-plugins-traffic: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-traffic: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go
b/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go
index 06853d81..59c6554b 100644
--- a/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go
+++ b/test/e2e/suite-plugins/suite-plugins-traffic/limit_count.go
@@ -230,7 +230,7 @@ spec:
}
ginkgo.Describe("suite-plugins-traffic: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-traffic: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go
b/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go
index 1476f3a5..e8d60d92 100644
--- a/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go
+++ b/test/e2e/suite-plugins/suite-plugins-traffic/request-validation.go
@@ -189,7 +189,7 @@ spec:
}
ginkgo.Describe("suite-plugins-traffic: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-traffic: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git a/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go
b/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go
index ad1dcdf6..ea3113f6 100644
--- a/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go
+++ b/test/e2e/suite-plugins/suite-plugins-traffic/request_id.go
@@ -171,7 +171,7 @@ spec:
}
ginkgo.Describe("suite-plugins-traffic: scaffold v2beta3", func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-traffic: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git
a/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go
b/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go
index 6e92a19a..515f7267 100644
--- a/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go
+++ b/test/e2e/suite-plugins/suite-plugins-transformation/fault_injection.go
@@ -234,7 +234,7 @@ spec:
}
ginkgo.Describe("suite-plugins-transformation: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-transformation: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git
a/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go
b/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go
index c8897175..70516ec4 100644
--- a/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go
+++ b/test/e2e/suite-plugins/suite-plugins-transformation/proxy_rewrite.go
@@ -233,7 +233,7 @@ spec:
}
ginkgo.Describe("suite-plugins-transformation: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-transformation: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
diff --git
a/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go
b/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go
index 4cae34c0..9460b50e 100644
--- a/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go
+++ b/test/e2e/suite-plugins/suite-plugins-transformation/response_rewrite.go
@@ -238,7 +238,7 @@ spec:
}
ginkgo.Describe("suite-plugins-transformation: scaffold v2beta3",
func() {
- suites(scaffold.NewDefaultScaffold)
+ suites(scaffold.NewDefaultV2beta3Scaffold)
})
ginkgo.Describe("suite-plugins-transformation: scaffold v2", func() {
suites(scaffold.NewDefaultV2Scaffold)
