Skip to content

Commit 9daf035

Browse files
ronethingronething
committed
fix: r
Signed-off-by: Ashing Zheng <[email protected]>
1 parent ab7de42 commit 9daf035

File tree

8 files changed

+36
-68
lines changed

8 files changed

+36
-68
lines changed

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

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -64,47 +64,13 @@ var _ = Describe("APISIX Standalone Basic Tests", Label("apisix.apache.org", "v2
6464

6565
Context("IngressClass Annotations", func() {
6666
It("Basic tests", func() {
67-
const gatewayProxyYaml = `
68-
apiVersion: apisix.apache.org/v1alpha1
69-
kind: GatewayProxy
70-
metadata:
71-
name: apisix-proxy-config
72-
spec:
73-
provider:
74-
type: ControlPlane
75-
controlPlane:
76-
endpoints:
77-
- %s
78-
auth:
79-
type: AdminKey
80-
adminKey:
81-
value: "%s"
82-
`
83-
84-
const ingressClassYaml = `
85-
apiVersion: networking.k8s.io/%s
86-
kind: IngressClass
87-
metadata:
88-
name: apisix
89-
annotations:
90-
apisix.apache.org/parameters-namespace: %s
91-
spec:
92-
controller: apisix.apache.org/apisix-ingress-controller
93-
parameters:
94-
apiGroup: apisix.apache.org
95-
kind: GatewayProxy
96-
name: apisix-proxy-config
97-
`
98-
9967
By("create GatewayProxy")
100-
gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
101-
err := s.CreateResourceFromString(gatewayProxy)
68+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
10269
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
10370
time.Sleep(5 * time.Second)
10471

10572
By("create IngressClass")
106-
ingressClass := fmt.Sprintf(ingressClassYaml, framework.IngressVersion, s.Namespace())
107-
err = s.CreateResourceFromStringWithNamespace(ingressClass, "")
73+
err = s.CreateResourceFromStringWithNamespace(s.GetIngressClassYaml(), "")
10874
Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
10975
time.Sleep(5 * time.Second)
11076

@@ -114,7 +80,7 @@ kind: ApisixRoute
11480
metadata:
11581
name: default
11682
spec:
117-
ingressClassName: apisix
83+
ingressClassName: %s
11884
http:
11985
- name: rule0
12086
match:
@@ -132,13 +98,13 @@ spec:
13298

13399
By("apply ApisixRoute")
134100
var apisixRoute apiv2.ApisixRoute
135-
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apisixRoute, fmt.Sprintf(apisixRouteSpec, "/get"))
101+
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apisixRoute, fmt.Sprintf(apisixRouteSpec, s.Namespace(), "/get"))
136102

137103
By("verify ApisixRoute works")
138104
Eventually(request).WithArguments("/get").WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusOK))
139105

140106
By("update ApisixRoute")
141-
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apisixRoute, fmt.Sprintf(apisixRouteSpec, "/headers"))
107+
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apisixRoute, fmt.Sprintf(apisixRouteSpec, s.Namespace(), "/headers"))
142108
Eventually(request).WithArguments("/get").WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusNotFound))
143109
s.RequestAssert(&scaffold.RequestAssert{
144110
Method: "GET",

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

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

4242
BeforeEach(func() {
4343
By("create GatewayProxy")
44-
gatewayProxy := s.GetGatewayProxySpec()
45-
err := s.CreateResourceFromString(gatewayProxy)
44+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
4645
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
4746
time.Sleep(5 * time.Second)
4847

‎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.GetGatewayProxySpec()
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 & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,6 @@ import (
3131
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
3232
)
3333

34-
const ingressClassYamlPluginConfig = `
35-
apiVersion: networking.k8s.io/%s
36-
kind: IngressClass
37-
metadata:
38-
name: apisix
39-
spec:
40-
controller: "apisix.apache.org/apisix-ingress-controller"
41-
parameters:
42-
apiGroup: "apisix.apache.org"
43-
kind: "GatewayProxy"
44-
name: "apisix-proxy-config"
45-
`
46-
4734
var _ = Describe("Test ApisixPluginConfig", Label("apisix.apache.org", "v2", "apisixpluginconfig"), func() {
4835
var (
4936
s = scaffold.NewDefaultScaffold()
@@ -53,8 +40,7 @@ var _ = Describe("Test ApisixPluginConfig", Label("apisix.apache.org", "v2", "ap
5340
Context("Test ApisixPluginConfig", func() {
5441
BeforeEach(func() {
5542
By("create GatewayProxy")
56-
gatewayProxy := s.GetGatewayProxySpec()
57-
err := s.CreateResourceFromString(gatewayProxy)
43+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
5844
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
5945
time.Sleep(5 * time.Second)
6046

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

Lines changed: 5 additions & 4 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.GetGatewayProxySpec()
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

@@ -809,7 +808,8 @@ spec:
809808
weight: 5
810809
`
811810
By("apply ApisixRoute with traffic split")
812-
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute), apisixRouteSpec)
811+
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute),
812+
fmt.Sprintf(apisixRouteSpec, s.Namespace(), s.Namespace()))
813813
By("send requests to verify traffic split")
814814
var (
815815
hitHttpbinCnt = 0
@@ -867,7 +867,8 @@ spec:
867867
weight: 0
868868
`
869869
By("apply ApisixRoute with zero-weight backend")
870-
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute), apisixRouteSpec)
870+
applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, new(apiv2.ApisixRoute),
871+
fmt.Sprintf(apisixRouteSpec, s.Namespace(), s.Namespace()))
871872
By("wait for route to be ready")
872873
s.RequestAssert(&scaffold.RequestAssert{
873874
Method: "GET",

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ var _ = Describe("Test apisix.apache.org/v2 Status", Label("apisix.apache.org",
4646
Context("Test ApisixRoute Sync Status", func() {
4747
BeforeEach(func() {
4848
By("create GatewayProxy")
49-
gatewayProxy := s.GetGatewayProxySpec()
50-
err := s.CreateResourceFromString(gatewayProxy)
49+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
5150
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
5251
time.Sleep(5 * time.Second)
5352

@@ -333,8 +332,7 @@ spec:
333332
`
334333
BeforeEach(func() {
335334
By("create GatewayProxy")
336-
gatewayProxy := s.GetGatewayProxySpec()
337-
err := s.CreateResourceFromString(gatewayProxy)
335+
err := s.CreateResourceFromString(s.GetGatewayProxySpec())
338336
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
339337
time.Sleep(5 * time.Second)
340338

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ var _ = Describe("Test ApisixTls", Label("apisix.apache.org", "v2", "apisixtls")
6666
Context("Test ApisixTls", func() {
6767
BeforeEach(func() {
6868
By("create GatewayProxy")
69-
gatewayProxy := s.GetGatewayProxySpec()
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/scaffold/scaffold.go‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,26 @@ func (s *Scaffold) DeleteResource(resourceType, name string) error {
269269
return k8s.RunKubectlE(s.t, s.kubectlOptions, "delete", resourceType, name)
270270
}
271271

272+
func (s *Scaffold) NamespaceSelectorLabelStrings() []string {
273+
var labels []string
274+
if s.opts.NamespaceSelectorLabel != nil {
275+
for k, v := range s.opts.NamespaceSelectorLabel {
276+
for _, v0 := range v {
277+
labels = append(labels, fmt.Sprintf("%s=%s", k, v0))
278+
}
279+
}
280+
} else {
281+
for k, v := range s.label {
282+
labels = append(labels, fmt.Sprintf("%s=%s", k, v))
283+
}
284+
}
285+
return labels
286+
}
287+
288+
func (s *Scaffold) NamespaceSelectorLabel() map[string][]string {
289+
return s.opts.NamespaceSelectorLabel
290+
}
291+
272292
func (s *Scaffold) labelSelector(label string) metav1.ListOptions {
273293
return metav1.ListOptions{
274294
LabelSelector: label,

0 commit comments

Comments
 (0)