fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

test/e2e/scaffold/api7_deployer.go

@@ -54,7 +54,7 @@ func (s *API7Deployer) BeforeEach() {
 		Namespace:  s.namespace,
 	}
 	if s.opts.ControllerName == "" {
-		s.opts.ControllerName = fmt.Sprintf("%s/%d", DefaultControllerName, time.Now().Nanosecond())
+		s.opts.ControllerName = fmt.Sprintf("%s/%s", DefaultControllerName, s.namespace)
 	}
 	s.finalizers = nil
 	if s.label == nil {
@@ -122,14 +122,14 @@ func (s *API7Deployer) AfterEach() {
 		Expect(err).NotTo(HaveOccurred(), "cleaning up additional gateway group")
 	}
 
-	// if the test case is successful, just delete namespace
-	err := k8s.DeleteNamespaceE(s.t, s.kubectlOptions, s.namespace)
-	Expect(err).NotTo(HaveOccurred(), "deleting namespace "+s.namespace)
-
 	for i := len(s.finalizers) - 1; i >= 0; i-- {
 		runWithRecover(s.finalizers[i])
 	}
 
+	// if the test case is successful, just delete namespace
+	err := k8s.DeleteNamespaceE(s.t, s.kubectlOptions, s.namespace)
+	Expect(err).NotTo(HaveOccurred(), "deleting namespace "+s.namespace)
+
 	// Wait for a while to prevent the worker node being overwhelming
 	// (new cases will be run).
 	time.Sleep(3 * time.Second)