fix tests

Author: Revolyssup

test/e2e/gatewayapi/controller.go

@@ -17,6 +17,7 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: GatewayClass
 metadata:
   name: %s
+  namespace: %s
 spec:
   controllerName: %s
 `
@@ -26,6 +27,7 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: %s
+  namespace: %s
 spec:
   gatewayClassName: %s
   listeners:
@@ -34,12 +36,12 @@ spec:
       port: 80
 `
 
-	var ResourceApplied = func(s *scaffold.Scaffold, resourType, resourceName, resourceRaw string, observedGeneration int) {
-		Expect(s.CreateResourceFromString(resourceRaw)).
+	var ResourceApplied = func(s *scaffold.Scaffold, resourType, resourceName, ns, resourceRaw string, observedGeneration int) {
+		Expect(s.CreateResourceFromStringWithNamespace(resourceRaw, ns)).
 			NotTo(HaveOccurred(), fmt.Sprintf("creating %s", resourType))
 
 		Eventually(func() string {
-			hryaml, err := s.GetResourceYaml(resourType, resourceName)
+			hryaml, err := s.GetResourceYamlFromNamespace(resourType, resourceName, ns)
 			Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("getting %s yaml", resourType))
 			return hryaml
 		}, "8s", "2s").
@@ -53,25 +55,31 @@ spec:
 		time.Sleep(1 * time.Second)
 	}
 	var beforeEach = func(s *scaffold.Scaffold, gatewayName string) {
+		s.CreateResourceFromString(fmt.Sprintf(`
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: %s
+`, gatewayName))
 		By(fmt.Sprintf("create GatewayClass for controller %s", s.GetControllerName()))
 		gatewayClassName := fmt.Sprintf("api7-%d", time.Now().Unix())
-		err := s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGatewayClass, gatewayClassName, s.GetControllerName()), s.Namespace())
+		err := s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGatewayClass, gatewayClassName, gatewayName, s.GetControllerName()), gatewayName)
 		Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
-		time.Sleep(20 * time.Second)
+		time.Sleep(10 * time.Second)
 
 		By("check GatewayClass condition")
-		gcyaml, err := s.GetResourceYaml("GatewayClass", gatewayClassName)
+		gcyaml, err := s.GetResourceYamlFromNamespace("GatewayClass", gatewayClassName, gatewayName)
 		Expect(err).NotTo(HaveOccurred(), "getting GatewayClass yaml")
 		Expect(gcyaml).To(ContainSubstring(`status: "True"`), "checking GatewayClass condition status")
 		Expect(gcyaml).To(ContainSubstring("message: the gatewayclass has been accepted by the api7-ingress-controller"), "checking GatewayClass condition message")
 
 		By("create Gateway")
-		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGateway, gatewayName, gatewayClassName), s.Namespace())
+		err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defautlGateway, gatewayName, gatewayName, gatewayClassName), gatewayName)
 		Expect(err).NotTo(HaveOccurred(), "creating Gateway")
-		time.Sleep(20 * time.Second)
+		time.Sleep(10 * time.Second)
 
 		By("check Gateway condition")
-		gwyaml, err := s.GetResourceYaml("Gateway", gatewayName)
+		gwyaml, err := s.GetResourceYamlFromNamespace("Gateway", gatewayName, gatewayName)
 		Expect(err).NotTo(HaveOccurred(), "getting Gateway yaml")
 		Expect(gwyaml).To(ContainSubstring(`status: "True"`), "checking Gateway condition status")
 		Expect(gwyaml).To(ContainSubstring("message: the gateway has been accepted by the api7-ingress-controller"), "checking Gateway condition message")
@@ -82,15 +90,12 @@ spec:
 			Name:           "gateway1",
 			ControllerName: "gateway.api7.io/api7-ingress-controller-1",
 		})
-		s2 := scaffold.NewScaffold(&scaffold.Options{
-			Name:           "gateway2",
-			ControllerName: "gateway.api7.io/api7-ingress-controller-2",
-		})
 		var route1 = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: httpbin
+  namespace: gateway1
 spec:
   parentRefs:
   - name: gateway1
@@ -115,11 +120,28 @@ spec:
       port: 80
       weight: 50
  `
+		BeforeEach(func() {
+			beforeEach(s1, "gateway1")
+		})
+		It("Apply resource ", func() {
+			ResourceApplied(s1, "HTTPRoute", "httpbin", "gateway1", route1, 1)
+			routes, err := s1.DefaultDataplaneResource().Route().List(s1.Context)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(routes).To(HaveLen(1))
+			assert.Equal(GinkgoT(), routes[0].Labels["controller_name"], "gateway.api7.io/api7-ingress-controller-1")
+		})
+	})
+	Context("Create resource with second controller", func() {
+		s2 := scaffold.NewScaffold(&scaffold.Options{
+			Name:           "gateway2",
+			ControllerName: "gateway.api7.io/api7-ingress-controller-2",
+		})
 		var route2 = `
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: httpbin2
+  namespace: gateway2
 spec:
   parentRefs:
   - name: gateway2
@@ -145,18 +167,11 @@ spec:
       weight: 50
 `
 		BeforeEach(func() {
-			beforeEach(s1, "gateway1")
 			beforeEach(s2, "gateway2")
 		})
 		It("Apply resource ", func() {
-			ResourceApplied(s1, "HTTPRoute", "httpbin", route1, 1)
-			ResourceApplied(s2, "HTTPRoute", "httpbin2", route2, 1)
-			routes, err := s1.DefaultDataplaneResource().Route().List(s1.Context)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(routes).To(HaveLen(1))
-			assert.Equal(GinkgoT(), routes[0].Labels["controller_name"], "gateway.api7.io/api7-ingress-controller-1")
-
-			routes, err = s2.DefaultDataplaneResource().Route().List(s2.Context)
+			ResourceApplied(s2, "HTTPRoute", "httpbin2", "gateway2", route2, 1)
+			routes, err := s2.DefaultDataplaneResource().Route().List(s2.Context)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(routes).To(HaveLen(1))
 			assert.Equal(GinkgoT(), routes[0].Labels["controller_name"], "gateway.api7.io/api7-ingress-controller-2")

test/e2e/gatewayapi/gateway.go

@@ -288,6 +288,7 @@ spec:
 				assert.Nil(GinkgoT(), err, "list tls error")
 				assert.Len(GinkgoT(), tls, 1, "tls number not expect")
 				assert.Equal(GinkgoT(), Cert, tls[0].Cert, "tls cert not expect")
+				assert.Equal(GinkgoT(), tls[0].Labels["controller_name"], "gateway.api7.io/api7-ingress-controller")
 			})
 		})
 	})

test/e2e/scaffold/k8s.go

@@ -84,6 +84,10 @@ func (s *Scaffold) GetOutputFromString(shell ...string) (string, error) {
 	return output, err
 }
 
+func (s *Scaffold) GetResourceYamlFromNamespace(resourceType, resourceName, namespace string) (string, error) {
+	return s.GetOutputFromString(resourceType, resourceName, "-n", namespace, "-o", "yaml")
+}
+
 func (s *Scaffold) GetResourceYaml(resourceType, resourceName string) (string, error) {
 	return s.GetOutputFromString(resourceType, resourceName, "-o", "yaml")
 }