Skip to content

Commit 0154b13

Browse files
ronethingronething
authored
test: unified gatewayproxy yaml acquisition (#2562)
Signed-off-by: Ashing Zheng <[email protected]>
1 parent 3d4d833 commit 0154b13

File tree

12 files changed

+110
-324
lines changed

12 files changed

+110
-324
lines changed

‎test/e2e/crds/v1alpha1/backendtrafficpolicy.go‎

Lines changed: 8 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,6 @@ var _ = Describe("Test BackendTrafficPolicy base on HTTPRoute", Label("apisix.ap
3434
err error
3535
)
3636

37-
var defaultGatewayProxy = `
38-
apiVersion: apisix.apache.org/v1alpha1
39-
kind: GatewayProxy
40-
metadata:
41-
name: %s
42-
spec:
43-
provider:
44-
type: ControlPlane
45-
controlPlane:
46-
endpoints:
47-
- %s
48-
auth:
49-
type: AdminKey
50-
adminKey:
51-
value: "%s"
52-
`
53-
54-
var defaultGatewayClass = `
55-
apiVersion: gateway.networking.k8s.io/v1
56-
kind: GatewayClass
57-
metadata:
58-
name: %s
59-
spec:
60-
controllerName: %s
61-
`
62-
63-
var defaultGateway = `
64-
apiVersion: gateway.networking.k8s.io/v1
65-
kind: Gateway
66-
metadata:
67-
name: %s
68-
spec:
69-
gatewayClassName: %s
70-
listeners:
71-
- name: http1
72-
protocol: HTTP
73-
port: 80
74-
infrastructure:
75-
parametersRef:
76-
group: apisix.apache.org
77-
kind: GatewayProxy
78-
name: %s
79-
`
80-
8137
var defaultHTTPRoute = `
8238
apiVersion: gateway.networking.k8s.io/v1
8339
kind: HTTPRoute
@@ -133,19 +89,17 @@ spec:
13389
BeforeEach(func() {
13490
gatewayName := s.Namespace()
13591
By("create GatewayProxy")
136-
gatewayProxyName := gatewayName
137-
err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, gatewayProxyName, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
92+
err = s.CreateResourceFromString(s.GetGatewayProxySpec())
13893
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
13994
time.Sleep(time.Second)
14095

14196
By("create GatewayClass")
142-
gatewayClassName := s.Namespace()
143-
err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
97+
err = s.CreateResourceFromString(s.GetGatewayClassYaml())
14498
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
14599
time.Sleep(time.Second)
146100

147101
By("create Gateway")
148-
err = s.CreateResourceFromString(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName, gatewayProxyName))
102+
err = s.CreateResourceFromString(s.GetGatewayYaml())
149103
Expect(err).NotTo(HaveOccurred(), "creating Gateway")
150104
time.Sleep(time.Second)
151105

@@ -210,22 +164,6 @@ spec:
210164
var _ = Describe("Test BackendTrafficPolicy base on Ingress", Label("apisix.apache.org", "v1alpha1", "backendtrafficpolicy"), func() {
211165
s := scaffold.NewDefaultScaffold()
212166

213-
var defaultGatewayProxy = `
214-
apiVersion: apisix.apache.org/v1alpha1
215-
kind: GatewayProxy
216-
metadata:
217-
name: %s
218-
spec:
219-
provider:
220-
type: ControlPlane
221-
controlPlane:
222-
endpoints:
223-
- %s
224-
auth:
225-
type: AdminKey
226-
adminKey:
227-
value: "%s"
228-
`
229167
var defaultIngressClass = `
230168
apiVersion: networking.k8s.io/v1
231169
kind: IngressClass
@@ -234,12 +172,12 @@ metadata:
234172
annotations:
235173
ingressclass.kubernetes.io/is-default-class: "true"
236174
spec:
237-
controller: "%s"
175+
controller: %s
238176
parameters:
239177
apiGroup: "apisix.apache.org"
240178
kind: "GatewayProxy"
241-
name: "%s"
242-
namespace: "%s"
179+
name: "apisix-proxy-config"
180+
namespace: %s
243181
scope: "Namespace"
244182
`
245183

@@ -263,13 +201,11 @@ spec:
263201
`
264202
var beforeEach = func() {
265203
By("create GatewayProxy")
266-
gatewayProxyName := s.Namespace()
267-
gatewayProxy := fmt.Sprintf(defaultGatewayProxy, gatewayProxyName, s.Deployer.GetAdminEndpoint(), s.AdminKey())
268-
err := s.CreateResourceFromString(gatewayProxy)
204+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
269205
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
270206

271207
By("create IngressClass with GatewayProxy reference")
272-
err = s.CreateResourceFromString(fmt.Sprintf(defaultIngressClass, s.GetControllerName(), gatewayProxyName, s.Namespace()))
208+
err = s.CreateResourceFromString(fmt.Sprintf(defaultIngressClass, s.GetControllerName(), s.Namespace()))
273209
Expect(err).NotTo(HaveOccurred(), "creating IngressClass with GatewayProxy")
274210

275211
By("create Ingress with GatewayProxy IngressClass")

‎test/e2e/crds/v1alpha1/consumer.go‎

Lines changed: 7 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,6 @@ var _ = Describe("Test Consumer", Label("apisix.apache.org", "v1alpha1", "consum
3434
err error
3535
)
3636

37-
var defaultGatewayProxy = `
38-
apiVersion: apisix.apache.org/v1alpha1
39-
kind: GatewayProxy
40-
metadata:
41-
name: %s
42-
spec:
43-
provider:
44-
type: ControlPlane
45-
controlPlane:
46-
endpoints:
47-
- %s
48-
auth:
49-
type: AdminKey
50-
adminKey:
51-
value: "%s"
52-
`
53-
54-
var defaultGatewayClass = `
55-
apiVersion: gateway.networking.k8s.io/v1
56-
kind: GatewayClass
57-
metadata:
58-
name: %s
59-
spec:
60-
controllerName: %s
61-
`
62-
63-
var defaultGateway = `
64-
apiVersion: gateway.networking.k8s.io/v1
65-
kind: Gateway
66-
metadata:
67-
name: %s
68-
spec:
69-
gatewayClassName: %s
70-
listeners:
71-
- name: http1
72-
protocol: HTTP
73-
port: 80
74-
infrastructure:
75-
parametersRef:
76-
group: apisix.apache.org
77-
kind: GatewayProxy
78-
name: %s
79-
`
80-
8137
var defaultHTTPRoute = `
8238
apiVersion: apisix.apache.org/v1alpha1
8339
kind: PluginConfig
@@ -119,26 +75,23 @@ spec:
11975
`
12076

12177
BeforeEach(func() {
122-
gatewayName := s.Namespace()
123-
By("create GatewayProxy")
124-
gatewayProxyName := s.Namespace()
125-
err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGatewayProxy, gatewayProxyName, s.Deployer.GetAdminEndpoint(), s.AdminKey()), s.Namespace())
78+
By("create GatewayProxy, control plane using endpoints")
79+
err = s.CreateResourceFromString(s.GetGatewayProxySpec())
12680
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
12781
time.Sleep(time.Second)
12882

12983
By("create GatewayClass")
130-
gatewayClassName := s.Namespace()
131-
err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
84+
err = s.CreateResourceFromString(s.GetGatewayClassYaml())
13285
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
13386
time.Sleep(time.Second)
13487

13588
By("create Gateway")
136-
err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName, gatewayProxyName), s.Namespace())
89+
err = s.CreateResourceFromString(s.GetGatewayYaml())
13790
Expect(err).NotTo(HaveOccurred(), "creating Gateway")
13891
time.Sleep(time.Second)
13992

14093
By("create HTTPRoute")
141-
s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, gatewayName))
94+
s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, s.Namespace()))
14295
})
14396

14497
Context("Consumer plugins", func() {
@@ -520,7 +473,7 @@ spec:
520473
apiVersion: apisix.apache.org/v1alpha1
521474
kind: GatewayProxy
522475
metadata:
523-
name: %s
476+
name: apisix-proxy-config
524477
spec:
525478
provider:
526479
type: ControlPlane
@@ -573,7 +526,7 @@ spec:
573526
})
574527

575528
By("update GatewayProxy with new admin key")
576-
updatedProxy := fmt.Sprintf(updatedGatewayProxy, s.Namespace(), s.Deployer.GetAdminEndpoint(resources.DataplaneService), resources.AdminAPIKey)
529+
updatedProxy := fmt.Sprintf(updatedGatewayProxy, s.Deployer.GetAdminEndpoint(resources.DataplaneService), resources.AdminAPIKey)
577530
err = s.CreateResourceFromStringWithNamespace(updatedProxy, s.Namespace())
578531
Expect(err).NotTo(HaveOccurred(), "updating GatewayProxy")
579532

‎test/e2e/crds/v2/consumer.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ var _ = Describe("Test ApisixConsumer", Label("apisix.apache.org", "v2", "apisix
6666

6767
BeforeEach(func() {
6868
By("create GatewayProxy")
69-
gatewayProxy := s.GetGatewayProxyYaml()
70-
err := s.CreateResourceFromString(gatewayProxy)
69+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
7170
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
7271
time.Sleep(5 * time.Second)
7372

‎test/e2e/crds/v2/globalrule.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ spec:
5454
Context("ApisixGlobalRule Basic Operations", func() {
5555
BeforeEach(func() {
5656
By("create GatewayProxy")
57-
gatewayProxy := s.GetGatewayProxyYaml()
58-
err := s.CreateResourceFromString(gatewayProxy)
57+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
5958
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
6059
time.Sleep(5 * time.Second)
6160

‎test/e2e/crds/v2/pluginconfig.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ var _ = Describe("Test ApisixPluginConfig", Label("apisix.apache.org", "v2", "ap
4040
Context("Test ApisixPluginConfig", func() {
4141
BeforeEach(func() {
4242
By("create GatewayProxy")
43-
gatewayProxy := s.GetGatewayProxyYaml()
44-
err := s.CreateResourceFromString(gatewayProxy)
43+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
4544
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
4645
time.Sleep(5 * time.Second)
4746

‎test/e2e/crds/v2/route.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ var _ = Describe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixrou
4848

4949
BeforeEach(func() {
5050
By("create GatewayProxy")
51-
gatewayProxy := s.GetGatewayProxyYaml()
52-
err := s.CreateResourceFromString(gatewayProxy)
51+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
5352
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
5453
time.Sleep(5 * time.Second)
5554

‎test/e2e/crds/v2/status.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ var _ = Describe("Test CRD Status", Label("apisix.apache.org", "v2", "apisixrout
4242
Context("Test ApisixRoute Sync Status", func() {
4343
BeforeEach(func() {
4444
By("create GatewayProxy")
45-
gatewayProxy := s.GetGatewayProxyWithServiceYaml()
46-
err := s.CreateResourceFromString(gatewayProxy)
45+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
4746
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
4847
time.Sleep(5 * time.Second)
4948

‎test/e2e/crds/v2/streamroute.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ var _ = Describe("Test ApisixRoute With StreamRoute", Label("apisix.apache.org",
3737
Skip("only support APISIX provider")
3838
}
3939
By("create GatewayProxy")
40-
gatewayProxy := s.GetGatewayProxyYaml()
41-
err := s.CreateResourceFromString(gatewayProxy)
40+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
4241
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
4342
time.Sleep(5 * time.Second)
4443

0 commit comments

Comments
 (0)