Merge pull request #129714 from esotsal/fix-reset-injector-because-cri-proxy-undefined

testing: Skip test if cri proxy is disabled or undefined

test/e2e_node/container_restart_test.go

@@ -53,11 +53,9 @@ var _ = SIGDescribe("Container Restart", feature.CriProxy, framework.WithSerial(
 			if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
 				ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
 			}
-		})
+			ginkgo.DeferCleanup(func() error {
-
+				return resetCRIProxyInjector(e2eCriProxy)
-		ginkgo.AfterEach(func() {
+			})
-			err := resetCRIProxyInjector(e2eCriProxy)
-			framework.ExpectNoError(err)
 		})
 
 		ginkgo.It("Container restart backs off.", func(ctx context.Context) {
@@ -77,11 +75,9 @@ var _ = SIGDescribe("Container Restart", feature.CriProxy, framework.WithSerial(
 			if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
 				ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
 			}
-		})
+			ginkgo.DeferCleanup(func() error {
-
+				return resetCRIProxyInjector(e2eCriProxy)
-		ginkgo.AfterEach(func() {
+			})
-			err := resetCRIProxyInjector(e2eCriProxy)
-			framework.ExpectNoError(err)
 		})
 
 		ginkgo.It("Alternate restart backs off.", func(ctx context.Context) {

test/e2e_node/criproxy_test.go

@@ -51,11 +51,9 @@ var _ = SIGDescribe(feature.CriProxy, framework.WithSerial(), func() {
 			if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
 				ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
 			}
-		})
+			ginkgo.DeferCleanup(func() error {
-
+				return resetCRIProxyInjector(e2eCriProxy)
-		ginkgo.AfterEach(func() {
+			})
-			err := resetCRIProxyInjector(e2eCriProxy)
-			framework.ExpectNoError(err)
 		})
 
 		ginkgo.It("Pod failed to start due to an image pull error.", func(ctx context.Context) {
@@ -89,11 +87,9 @@ var _ = SIGDescribe(feature.CriProxy, framework.WithSerial(), func() {
 			if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
 				ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
 			}
-		})
+			ginkgo.DeferCleanup(func() error {
-
+				return resetCRIProxyInjector(e2eCriProxy)
-		ginkgo.AfterEach(func() {
+			})
-			err := resetCRIProxyInjector(e2eCriProxy)
-			framework.ExpectNoError(err)
 		})
 
 	})
@@ -103,11 +99,9 @@ var _ = SIGDescribe(feature.CriProxy, framework.WithSerial(), func() {
 			if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
 				ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
 			}
-		})
+			ginkgo.DeferCleanup(func() error {
-
+				return resetCRIProxyInjector(e2eCriProxy)
-		ginkgo.AfterEach(func() {
+			})
-			err := resetCRIProxyInjector(e2eCriProxy)
-			framework.ExpectNoError(err)
 		})
 
 		ginkgo.It("Image pull time exceeded 10 seconds", func(ctx context.Context) {

test/e2e_node/image_pull_test.go

@@ -63,21 +63,13 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
 			if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
 				ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
 			}
-
+			ginkgo.DeferCleanup(func() error {
+				return resetCRIProxyInjector(e2eCriProxy)
+			})
 			testpods = prepareAndCleanup(ctx, f)
 			gomega.Expect(len(testpods)).To(gomega.BeNumerically("<=", 5))
 		})
 
-		ginkgo.AfterEach(func(ctx context.Context) {
-			err := resetCRIProxyInjector(e2eCriProxy)
-			framework.ExpectNoError(err)
-
-			ginkgo.By("cleanup pods")
-			for _, pod := range testpods {
-				deletePodSyncByName(ctx, f, pod.Name)
-			}
-		})
-
 		ginkgo.It("should pull immediately if no more than 5 pods", func(ctx context.Context) {
 			var mu sync.Mutex
 			timeout := 20 * time.Second
@@ -107,7 +99,8 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
 			framework.ExpectNoError(err)
 
 			for _, testpod := range testpods {
-				_ = e2epod.NewPodClient(f).Create(ctx, testpod)
+				pod := e2epod.NewPodClient(f).Create(ctx, testpod)
+				ginkgo.DeferCleanup(deletePodSyncByName, f, pod.Name)
 			}
 
 			imagePulled, podStartTime, podEndTime, err := getPodImagePullDurations(ctx, f, testpods)
@@ -146,21 +139,13 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
 			if err := resetCRIProxyInjector(e2eCriProxy); err != nil {
 				ginkgo.Skip("Skip the test since the CRI Proxy is undefined.")
 			}
-
+			ginkgo.DeferCleanup(func() error {
+				return resetCRIProxyInjector(e2eCriProxy)
+			})
 			testpods = prepareAndCleanup(ctx, f)
 			gomega.Expect(len(testpods)).To(gomega.BeNumerically("<=", 5))
 		})
 
-		ginkgo.AfterEach(func(ctx context.Context) {
-			err := resetCRIProxyInjector(e2eCriProxy)
-			framework.ExpectNoError(err)
-
-			ginkgo.By("cleanup pods")
-			for _, pod := range testpods {
-				deletePodSyncByName(ctx, f, pod.Name)
-			}
-		})
-
 		ginkgo.It("should be waiting more", func(ctx context.Context) {
 			// all serialize image pulls should timeout
 			timeout := 20 * time.Second
@@ -197,7 +182,9 @@ var _ = SIGDescribe("Pull Image", feature.CriProxy, framework.WithSerial(), func
 
 			var pods []*v1.Pod
 			for _, testpod := range testpods {
-				pods = append(pods, e2epod.NewPodClient(f).Create(ctx, testpod))
+				pod := e2epod.NewPodClient(f).Create(ctx, testpod)
+				ginkgo.DeferCleanup(deletePodSyncByName, f, pod.Name)
+				pods = append(pods, pod)
 			}
 			for _, pod := range pods {
 				err := e2epod.WaitForPodCondition(ctx, f.ClientSet, f.Namespace.Name, pod.Name, "Running", 2*time.Minute, func(pod *v1.Pod) (bool, error) {