(WIP) fix(ci): create/close tunnel logic

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

test/e2e/framework/api7_gateway.go

@@ -62,7 +62,7 @@ type API7DeployOptions struct {
 	Replicas         *int
 }
 
-func (f *Framework) DeployGateway(opts API7DeployOptions) *corev1.Service {
+func (f *Framework) DeployGateway(opts *API7DeployOptions) *corev1.Service {
 	if opts.ServiceName == "" {
 		opts.ServiceName = "api7ee3-apisix-gateway-mtls"
 	}

test/e2e/gatewayapi/httproute.go

@@ -1921,7 +1921,7 @@ spec:
 		})
 	})
 
-	Context("Test HTTPRoute sync during startup", func() {
+	FContext("Test HTTPRoute sync during startup", func() {
 		BeforeEach(beforeEachHTTP)
 		var route = `
 apiVersion: gateway.networking.k8s.io/v1
@@ -1988,6 +1988,7 @@ spec:
 			s.Deployer.ScaleDataplane(0)
 			s.Deployer.ScaleDataplane(1)
 			s.Deployer.ScaleIngress(1)
+			time.Sleep(10 * time.Second)
 
 			s.RequestAssert(&scaffold.RequestAssert{
 				Method: "GET",

test/e2e/scaffold/api7_deployer.go

@@ -114,6 +114,7 @@ func (s *API7Deployer) AfterEach() {
 		if output != "" {
 			_, _ = fmt.Fprintln(GinkgoWriter, output)
 		}
+		return
 	}
 
 	// Delete all additional namespaces
@@ -148,6 +149,7 @@ func (s *API7Deployer) DeployDataplane(deployOpts DeployDataplaneOptions) {
 		ForIngressGatewayGroup: true,
 		ServiceHTTPPort:        9080,
 		ServiceHTTPSPort:       9443,
+		Replicas:               ptr.To(1),
 	}
 	if deployOpts.Namespace != "" {
 		opts.Namespace = deployOpts.Namespace
@@ -164,13 +166,22 @@ func (s *API7Deployer) DeployDataplane(deployOpts DeployDataplaneOptions) {
 	if deployOpts.Replicas != nil {
 		opts.Replicas = deployOpts.Replicas
 	}
+	if opts.Replicas != nil && *opts.Replicas == 0 {
+		deployOpts.SkipCreateTunnels = true
+	}
 
-	svc := s.DeployGateway(opts)
+	for _, close := range []func(){
+		s.closeApisixHttpTunnel,
+		s.closeApisixHttpsTunnel,
+	} {
+		close()
+	}
 
+	svc := s.DeployGateway(&opts)
 	s.dataplaneService = svc
 
 	if !deployOpts.SkipCreateTunnels {
-		err := s.newAPISIXTunnels()
+		err := s.newAPISIXTunnels(opts.ServiceName)
 		Expect(err).ToNot(HaveOccurred(), "creating apisix tunnels")
 	}
 }
@@ -181,8 +192,7 @@ func (s *API7Deployer) ScaleDataplane(replicas int) {
 	})
 }
 
-func (s *API7Deployer) newAPISIXTunnels() error {
-	serviceName := "api7ee3-apisix-gateway-mtls"
+func (s *API7Deployer) newAPISIXTunnels(serviceName string) error {
 	httpTunnel, httpsTunnel, err := s.createDataplaneTunnels(s.dataplaneService, s.kubectlOptions, serviceName)
 	if err != nil {
 		return err
@@ -247,7 +257,7 @@ func (s *API7Deployer) CreateAdditionalGateway(namePrefix string) (string, *core
 	serviceName := fmt.Sprintf("api7ee3-apisix-gateway-%s", namePrefix)
 
 	// Deploy dataplane for this gateway group
-	svc := s.DeployGateway(framework.API7DeployOptions{
+	svc := s.DeployGateway(&framework.API7DeployOptions{
 		GatewayGroupID:         gatewayGroupID,
 		Namespace:              additionalNS,
 		Name:                   serviceName,