Services E2Es: Reset test variables before each test

Fixes: ovn-org#4733 Signed-off-by: Patryk Diak <[email protected]>
kyrtapz · Sep 19, 2024 · d6f145e · d6f145e
1 parent 8017e9a
commit d6f145e
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/test/e2e/service.go b/test/e2e/service.go
@@ -708,11 +708,8 @@ var _ = ginkgo.Describe("Services", func() {
 		var nodes *v1.NodeList
 		var err error
 		nodeIPs := make(map[string]map[int]string)
-		var egressPod *v1.Pod
 		var egressNode string
-		targetSecondaryNode := node{
-			name: "egressSecondaryTargetNode-allowed",
-		}
+		var targetSecondaryNode node
 
 		const (
 			endpointHTTPPort    = 80
@@ -722,6 +719,14 @@ var _ = ginkgo.Describe("Services", func() {
 			clientContainerName = "npclient"
 		)
 
+		ginkgo.BeforeEach(func() {
+			nodeIPs = make(map[string]map[int]string)
+			egressNode = ""
+			targetSecondaryNode = node{
+				name: "egressSecondaryTargetNode-allowed",
+			}
+		})
+
 		ginkgo.AfterEach(func() {
 			ginkgo.By("Cleaning up external container")
 			deleteClusterExternalContainer(clientContainerName)
@@ -745,7 +750,6 @@ var _ = ginkgo.Describe("Services", func() {
 				e2ekubectl.RunKubectlOrDie("default", "delete", "eip", "egressip", "--ignore-not-found=true")
 				e2ekubectl.RunKubectlOrDie("default", "label", "node", egressNode, "k8s.ovn.org/egress-assignable-")
 				tearDownNetworkAndTargetForMultiNIC([]string{egressNode}, targetSecondaryNode)
-				targetSecondaryNode.nodeIP = ""
 			}
 		})
 
@@ -924,7 +928,7 @@ var _ = ginkgo.Describe("Services", func() {
 			}
 
 			ginkgo.By("Choosing egressIP pod")
-			egressPod = endPoints[0]
+			egressPod := endPoints[0]
 			framework.Logf("EgressIP pod is %s/%s", endPoints[0].Namespace, endPoints[0].Name)
 
 			ginkgo.By("Label egress node" + egressNode + " create external container to send egress traffic to via secondary MultiNIC EIP")