Skip to content

Commit 122e643

Browse files
ronethingronething
committed
fix: r
Signed-off-by: Ashing Zheng <[email protected]>
1 parent 66dc7f6 commit 122e643

File tree

19 files changed

+35
-108
lines changed

19 files changed

+35
-108
lines changed

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

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,10 @@ import (
3030

3131
var _ = Describe("Test BackendTrafficPolicy base on HTTPRoute", Label("apisix.apache.org", "v1alpha1", "backendtrafficpolicy"), func() {
3232
var (
33-
s = scaffold.NewScaffold(&scaffold.Options{
34-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
35-
})
33+
s = scaffold.NewDefaultScaffold()
3634
err error
3735
)
3836

39-
var defaultGatewayProxy = `
40-
apiVersion: apisix.apache.org/v1alpha1
41-
kind: GatewayProxy
42-
metadata:
43-
name: %s
44-
spec:
45-
provider:
46-
type: ControlPlane
47-
controlPlane:
48-
endpoints:
49-
- %s
50-
auth:
51-
type: AdminKey
52-
adminKey:
53-
value: "%s"
54-
`
55-
5637
var defaultGatewayClass = `
5738
apiVersion: gateway.networking.k8s.io/v1
5839
kind: GatewayClass
@@ -142,7 +123,7 @@ spec:
142123
time.Sleep(time.Second)
143124

144125
By("create GatewayClass")
145-
gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
126+
gatewayClassName := s.Namespace()
146127
err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
147128
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
148129
time.Sleep(time.Second)
@@ -211,9 +192,7 @@ spec:
211192
})
212193

213194
var _ = Describe("Test BackendTrafficPolicy base on Ingress", Label("apisix.apache.org", "v1alpha1", "backendtrafficpolicy"), func() {
214-
s := scaffold.NewScaffold(&scaffold.Options{
215-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
216-
})
195+
s := scaffold.NewDefaultScaffold()
217196

218197
var defaultGatewayProxy = `
219198
apiVersion: apisix.apache.org/v1alpha1

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package v1alpha1
1919

2020
import (
2121
"fmt"
22-
"time"
2322
"os"
2423
"time"
2524

@@ -33,9 +32,7 @@ import (
3332

3433
var _ = Describe("Test Consumer", Label("apisix.apache.org", "v1alpha1", "consumer"), func() {
3534
var (
36-
s = scaffold.NewScaffold(&scaffold.Options{
37-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
38-
})
35+
s = scaffold.NewDefaultScaffold()
3936
err error
4037
)
4138

@@ -132,7 +129,7 @@ spec:
132129
time.Sleep(time.Second)
133130

134131
By("create GatewayClass")
135-
gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
132+
gatewayClassName := s.Namespace()
136133
err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
137134
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
138135
time.Sleep(time.Second)

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ import (
3636

3737
var _ = Describe("Test GatewayProxy", Label("apisix.apache.org", "v1alpha1", "gatewayproxy"), func() {
3838
var (
39-
s = scaffold.NewScaffold(&scaffold.Options{
40-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
41-
})
39+
s = scaffold.NewDefaultScaffold()
4240
err error
4341
)
4442

@@ -149,7 +147,7 @@ spec:
149147
time.Sleep(time.Second)
150148

151149
By("create GatewayClass")
152-
gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
150+
gatewayClassName := s.Namespace()
153151
err = s.CreateResourceFromString(fmt.Sprintf(gatewayClassSpec, gatewayClassName, s.GetControllerName()))
154152
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
155153
time.Sleep(time.Second)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ spec:
6464

6565
var _ = Describe("APISIX Standalone Basic Tests", Label("apisix.apache.org", "v2", "basic"), func() {
6666
var (
67-
s = scaffold.NewScaffold(&scaffold.Options{
68-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
69-
})
67+
s = scaffold.NewDefaultScaffold()
7068
applier = framework.NewApplier(s.GinkgoT, s.K8sClient, s.CreateResourceFromString)
7169
)
7270

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ type Headers map[string]string
3535

3636
var _ = Describe("Test ApisixConsumer", Label("apisix.apache.org", "v2", "apisixconsumer"), func() {
3737
var (
38-
s = scaffold.NewScaffold(&scaffold.Options{
39-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
40-
})
38+
s = scaffold.NewDefaultScaffold()
4139
applier = framework.NewApplier(s.GinkgoT, s.K8sClient, s.CreateResourceFromString)
4240
)
4341

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ import (
3030
)
3131

3232
var _ = Describe("Test GlobalRule", Label("apisix.apache.org", "v2", "apisixglobalrule"), func() {
33-
s := scaffold.NewScaffold(&scaffold.Options{
34-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
35-
})
33+
s := scaffold.NewDefaultScaffold()
3634

3735
var ingressYaml = `
3836
apiVersion: networking.k8s.io/v1

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ spec:
4646

4747
var _ = Describe("Test ApisixPluginConfig", Label("apisix.apache.org", "v2", "apisixpluginconfig"), func() {
4848
var (
49-
s = scaffold.NewScaffold(&scaffold.Options{
50-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
51-
})
49+
s = scaffold.NewDefaultScaffold()
5250
applier = framework.NewApplier(s.GinkgoT, s.K8sClient, s.CreateResourceFromString)
5351
)
5452

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ import (
4242

4343
var _ = Describe("Test ApisixRoute", Label("apisix.apache.org", "v2", "apisixroute"), func() {
4444
var (
45-
s = scaffold.NewScaffold(&scaffold.Options{
46-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
47-
})
45+
s = scaffold.NewDefaultScaffold()
4846
applier = framework.NewApplier(s.GinkgoT, s.K8sClient, s.CreateResourceFromString)
4947
)
5048

@@ -1224,11 +1222,11 @@ metadata:
12241222
name: %s
12251223
namespace: %s
12261224
spec:
1227-
ingressClassName: apisix
1225+
ingressClassName: %s
12281226
externalNodes:
12291227
- type: %s
12301228
name: %s
1231-
`, upstreamName, s.Namespace(), externalType, name)
1229+
`, upstreamName, s.Namespace(), s.Namespace(), externalType, name)
12321230
var upstream apiv2.ApisixUpstream
12331231
applier.MustApplyAPIv2(
12341232
types.NamespacedName{Namespace: s.Namespace(), Name: upstreamName},
@@ -1363,7 +1361,7 @@ metadata:
13631361
name: %s
13641362
namespace: %s
13651363
spec:
1366-
ingressClassName: apisix
1364+
ingressClassName: %s
13671365
externalNodes:
13681366
- type: Domain
13691367
name: httpbin.org
@@ -1374,7 +1372,7 @@ spec:
13741372
applier.MustApplyAPIv2(
13751373
types.NamespacedName{Namespace: s.Namespace(), Name: upstreamName},
13761374
&upstream,
1377-
fmt.Sprintf(upstreamSpec, upstreamName, s.Namespace()),
1375+
fmt.Sprintf(upstreamSpec, upstreamName, s.Namespace(), s.Namespace()),
13781376
)
13791377

13801378
createApisixRoute(routeName, upstreamName)
@@ -1411,7 +1409,7 @@ kind: ApisixUpstream
14111409
metadata:
14121410
name: %s
14131411
spec:
1414-
ingressClassName: apisix
1412+
ingressClassName: %s
14151413
externalNodes:
14161414
- type: Domain
14171415
name: postman-echo.com
@@ -1420,7 +1418,7 @@ spec:
14201418
applier.MustApplyAPIv2(
14211419
types.NamespacedName{Namespace: s.Namespace(), Name: upstreamName},
14221420
&upstream,
1423-
fmt.Sprintf(upstreamSpec, upstreamName),
1421+
fmt.Sprintf(upstreamSpec, upstreamName, s.Namespace()),
14241422
)
14251423
By("create ApisixRoute with both backends and upstreams")
14261424
routeSpec := fmt.Sprintf(`

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import (
3737
var _ = Describe("Test apisix.apache.org/v2 Status", Label("apisix.apache.org", "v2", "apisixroute"), func() {
3838
var (
3939
s = scaffold.NewScaffold(&scaffold.Options{
40-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
4140
// for triggering the sync
4241
SyncPeriod: 3 * time.Second,
4342
})
@@ -356,7 +355,7 @@ spec:
356355
time.Sleep(5 * time.Second)
357356

358357
By("create GatewayClass")
359-
gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
358+
gatewayClassName := s.Namespace()
360359
err = s.CreateResourceFromString(fmt.Sprintf(gatewayClass, gatewayClassName, s.GetControllerName()))
361360
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
362361
time.Sleep(5 * time.Second)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ var Key = strings.TrimSpace(framework.TestServerKey)
9292

9393
var _ = Describe("Test ApisixTls", Label("apisix.apache.org", "v2", "apisixtls"), func() {
9494
var (
95-
s = scaffold.NewScaffold(&scaffold.Options{
96-
ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
97-
})
95+
s = scaffold.NewDefaultScaffold()
9896
applier = framework.NewApplier(s.GinkgoT, s.K8sClient, s.CreateResourceFromString)
9997
)
10098

0 commit comments

Comments
 (0)