UPSTREAM: 131518: Don't reinitialize test framework during each test case

Author: bertinatto

test/e2e/common/node/pod_resize.go

@@ -68,7 +68,7 @@ func offsetMemory(index int64, value string) string {
 	return ptr.String()
 }
 
-func doPodResizeTests() {
+func doPodResizeTests(f *framework.Framework) {
 	type testCase struct {
 		name                string
 		containers          []e2epod.ResizableContainerInfo
@@ -1156,7 +1156,6 @@ func doPodResizeTests() {
 
 	for idx := range tests {
 		tc := tests[idx]
-		f := framework.NewDefaultFramework("pod-resize-tests")
 
 		ginkgo.It(tc.name, func(ctx context.Context) {
 			podClient := e2epod.NewPodClient(f)
@@ -1234,7 +1233,7 @@ func doPodResizeTests() {
 	}
 }
 
-func doPodResizeErrorTests() {
+func doPodResizeErrorTests(f *framework.Framework) {
 
 	type testCase struct {
 		name        string
@@ -1389,7 +1388,6 @@ func doPodResizeErrorTests() {
 
 	for idx := range tests {
 		tc := tests[idx]
-		f := framework.NewDefaultFramework("pod-resize-error-tests")
 
 		ginkgo.It(tc.name, func(ctx context.Context) {
 			podClient := e2epod.NewPodClient(f)
@@ -1452,6 +1450,6 @@ var _ = SIGDescribe("Pod InPlace Resize Container", framework.WithFeatureGate(fe
 		}
 	})
 
-	doPodResizeTests()
-	doPodResizeErrorTests()
+	doPodResizeTests(f)
+	doPodResizeErrorTests(f)
 })

test/e2e/node/pod_resize.go

@@ -39,7 +39,7 @@ import (
 	"github.com/onsi/gomega"
 )
 
-func doPodResizeAdmissionPluginsTests() {
+func doPodResizeAdmissionPluginsTests(f *framework.Framework) {
 	testcases := []struct {
 		name                  string
 		enableAdmissionPlugin func(ctx context.Context, f *framework.Framework)
@@ -118,8 +118,6 @@ func doPodResizeAdmissionPluginsTests() {
 	}
 
 	for _, tc := range testcases {
-		f := framework.NewDefaultFramework(tc.name)
-
 		ginkgo.It(tc.name, func(ctx context.Context) {
 			containers := []e2epod.ResizableContainerInfo{
 				{
@@ -458,7 +456,7 @@ var _ = SIGDescribe("Pod InPlace Resize Container", framework.WithFeatureGate(fe
 			e2eskipper.Skipf("runtime does not support InPlacePodVerticalScaling -- skipping")
 		}
 	})
-	doPodResizeAdmissionPluginsTests()
+	doPodResizeAdmissionPluginsTests(f)
 })
 
 func waitForResourceQuota(ctx context.Context, c clientset.Interface, ns, quotaName string) error {