refactor: simplify tunnel close handling and remove redundant pod list check

Author: dspo

test/e2e/crds/gatewayproxy.go

@@ -187,7 +187,6 @@ spec:
 				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["http://%s:9180"]}`, s.GetPodIP(s.Namespace(), "app.kubernetes.io/name=apisix"))
 			}
 
-			s.Deployer.DeployIngress()
 			By(fmt.Sprintf("wait for keyword: %s", keyword))
 			s.WaitControllerManagerLog(keyword, 60, time.Minute)
 		})

test/e2e/framework/k8s.go

@@ -368,7 +368,6 @@ func (f *Framework) WaitControllerManagerLog(keyword string, sinceSeconds int64,
 
 func (f *Framework) WaitPodsLog(selector, keyword string, sinceSeconds int64, timeout time.Duration) {
 	pods := f.ListRunningPods(selector)
-	Expect(pods).NotTo(BeEmpty())
 	wg := sync.WaitGroup{}
 	for _, p := range pods {
 		wg.Add(1)

test/e2e/scaffold/apisix_deployer.go

@@ -168,17 +168,12 @@ func (s *APISIXDeployer) DeployDataplane(deployOpts DeployDataplaneOptions) {
 		opts.Replicas = deployOpts.Replicas
 	}
 
-	if s.adminTunnel != nil {
-		s.adminTunnel.Close()
-		s.adminTunnel = nil
-	}
-	if s.apisixHttpTunnel != nil {
-		s.apisixHttpTunnel.Close()
-		s.apisixHttpTunnel = nil
-	}
-	if s.apisixHttpsTunnel != nil {
-		s.apisixHttpsTunnel.Close()
-		s.apisixHttpsTunnel = nil
+	for _, close := range []func(){
+		s.closeAdminTunnel,
+		s.closeApisixHttpTunnel,
+		s.closeApisixHttpsTunnel,
+	} {
+		close()
 	}
 
 	svc := s.deployDataplane(&opts)
@@ -305,14 +300,18 @@ func (s *APISIXDeployer) createAdminTunnel(svc *corev1.Service) (*k8s.Tunnel, er
 	if err := adminTunnel.ForwardPortE(s.t); err != nil {
 		return nil, err
 	}
-	s.addFinalizers(func() {
-		adminTunnel.Close()
-		s.adminTunnel = nil
-	})
+	s.addFinalizers(s.closeAdminTunnel)
 
 	return adminTunnel, nil
 }
 
+func (s *APISIXDeployer) closeAdminTunnel() {
+	if s.adminTunnel != nil {
+		s.adminTunnel.Close()
+		s.adminTunnel = nil
+	}
+}
+
 func (s *APISIXDeployer) CreateAdditionalGateway(namePrefix string) (string, *corev1.Service, error) {
 	// Create a new namespace for this additional gateway
 	additionalNS := fmt.Sprintf("%s-%d", namePrefix, time.Now().Unix())

test/e2e/scaffold/scaffold.go

@@ -313,23 +313,31 @@ func (s *Scaffold) createDataplaneTunnels(
 	if err := httpTunnel.ForwardPortE(s.t); err != nil {
 		return nil, nil, err
 	}
-	s.addFinalizers(func() {
-		httpTunnel.Close()
-		s.apisixHttpTunnel = nil
-	})
+	s.addFinalizers(s.closeApisixHttpTunnel)
 
 	if err := httpsTunnel.ForwardPortE(s.t); err != nil {
 		httpTunnel.Close()
 		return nil, nil, err
 	}
-	s.addFinalizers(func() {
-		httpsTunnel.Close()
-		s.apisixHttpsTunnel = nil
-	})
+	s.addFinalizers(s.closeApisixHttpsTunnel)
 
 	return httpTunnel, httpsTunnel, nil
 }
 
+func (s *Scaffold) closeApisixHttpTunnel() {
+	if s.apisixHttpTunnel != nil {
+		s.apisixHttpTunnel.Close()
+		s.apisixHttpTunnel = nil
+	}
+}
+
+func (s *Scaffold) closeApisixHttpsTunnel() {
+	if s.apisixHttpsTunnel != nil {
+		s.apisixHttpsTunnel.Close()
+		s.apisixHttpsTunnel = nil
+	}
+}
+
 // GetAdditionalGateway returns resources associated with a specific gateway
 func (s *Scaffold) GetAdditionalGateway(identifier string) (*GatewayResources, bool) {
 	resources, exists := s.additionalGateways[identifier]