add test

Author: AlinsRan

test/e2e/framework/ingress.go

@@ -33,6 +33,7 @@ type IngressDeployOpts struct {
 	Namespace      string
 	AdminEnpoint   string
 	StatusAddress  string
+	Replicas       int
 }
 
 func (f *Framework) DeployIngress(opts IngressDeployOpts) {

test/e2e/framework/manifests/ingress.yaml

@@ -340,6 +340,12 @@ data:
     controller_name: {{ .ControllerName | default "apisix.apache.org/api7-ingress-controller" }}
 
     leader_election_id: "api7-ingress-controller-leader"
+    provider:
+      sync_period: 0s
+                                        # The period between two consecutive syncs.
+                                        # The default value is 0 seconds, which means the controller will not sync.
+                                        # If you want to enable the sync, set it to a positive value.
+      init_sync_delay: 1m
 ---
 apiVersion: v1
 kind: Service
@@ -370,7 +376,7 @@ metadata:
   name: api7-ingress-controller-manager
   namespace: {{ .Namespace }}
 spec:
-  replicas: 1
+  replicas: {{ .Replicas | default 1 }}
   selector:
     matchLabels:
       app: api7-ingress-controller

test/e2e/gatewayapi/httproute.go

@@ -411,6 +411,25 @@ spec:
     backendRefs:
     - name: httpbin-service-e2e-test
       port: 80
+`
+		var exactRouteByGet2 = `
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: httpbin2
+spec:
+  parentRefs:
+  - name: api7ee
+  hostnames:
+  - httpbin2.example
+  rules:
+  - matches: 
+    - path:
+        type: Exact
+        value: /get
+    backendRefs:
+    - name: httpbin-service-e2e-test
+      port: 80
 `
 		var invalidBackendPort = `
 apiVersion: v1
@@ -532,6 +551,46 @@ spec:
 			Expect(nodes).To(HaveLen(1), "checking nodes length")
 			Expect(nodes[0].Port).To(Equal(80))
 		})
+
+		It("Delete HTTPRoute during restart", func() {
+			By("create HTTPRoute httpbin")
+			ResourceApplied("HTTPRoute", "httpbin", exactRouteByGet, 1)
+
+			By("create HTTPRoute httpbin2")
+			ResourceApplied("HTTPRoute", "httpbin2", exactRouteByGet2, 1)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin.example").
+				Expect().
+				Status(200)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin2.example").
+				Expect().
+				Status(200)
+
+			s.ScaleIngress(0)
+
+			By("delete HTTPRoute httpbin2")
+			s.DeleteResource("HTTPRoute", "httpbin2")
+
+			s.ScaleIngress(1)
+			time.Sleep(1 * time.Minute)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin.example").
+				Expect().
+				Status(200)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin2.example").
+				Expect().
+				Status(404)
+		})
 	})
 
 	Context("HTTPRoute Rule Match", func() {

test/e2e/ingress/ingress.go

@@ -170,7 +170,7 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: api7-ingress-default
+  name: api7-ingress-external
 spec:
   rules:
   - host: httpbin.external
@@ -234,6 +234,63 @@ spec:
 				Expect().
 				Status(200)
 		})
+
+		It("Delete Ingress during restart", func() {
+			By("create GatewayProxy")
+			gatewayProxy := fmt.Sprintf(gatewayProxyYaml, framework.DashboardTLSEndpoint, s.AdminKey())
+			err := s.CreateResourceFromStringWithNamespace(gatewayProxy, "default")
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(5 * time.Second)
+
+			By("create Default IngressClass")
+			err = s.CreateResourceFromStringWithNamespace(defaultIngressClass, "")
+			Expect(err).NotTo(HaveOccurred(), "creating Default IngressClass")
+			time.Sleep(5 * time.Second)
+
+			By("create Ingress with ExternalName")
+			err = s.CreateResourceFromString(ingressWithExternalName)
+			Expect(err).NotTo(HaveOccurred(), "creating Ingress without IngressClass")
+			time.Sleep(5 * time.Second)
+
+			By("create Ingress")
+			err = s.CreateResourceFromString(defaultIngress)
+			Expect(err).NotTo(HaveOccurred(), "creating Ingress without IngressClass")
+			time.Sleep(5 * time.Second)
+
+			By("checking the external service response")
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin.external").
+				Expect().
+				Status(200)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("default.example.com").
+				Expect().
+				Status(200)
+
+			s.ScaleIngress(0)
+
+			By("delete Ingress")
+			err = s.DeleteResourceFromString(defaultIngress)
+			Expect(err).NotTo(HaveOccurred(), "deleting Ingress without IngressClass")
+
+			s.ScaleIngress(1)
+			time.Sleep(1 * time.Minute)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("httpbin.external").
+				Expect().
+				Status(200)
+
+			s.NewAPISIXClient().
+				GET("/get").
+				WithHost("default.example.com").
+				Expect().
+				Status(404)
+		})
 	})
 
 	Context("IngressClass with GatewayProxy", func() {

test/e2e/scaffold/ingress.go

@@ -11,5 +11,17 @@ func (s *Scaffold) deployIngress() {
 		AdminTLSVerify: false,
 		Namespace:      s.namespace,
 		AdminEnpoint:   framework.DashboardTLSEndpoint,
+		Replicas:       1,
+	})
+}
+
+func (s *Scaffold) ScaleIngress(replicas int) {
+	s.DeployIngress(framework.IngressDeployOpts{
+		ControllerName: s.opts.ControllerName,
+		AdminKey:       s.AdminKey(),
+		AdminTLSVerify: false,
+		Namespace:      s.namespace,
+		AdminEnpoint:   framework.DashboardTLSEndpoint,
+		Replicas:       replicas,
 	})
 }