Merge pull request #117379 from bart0sh/PR111-control-e2e-framework-k/k/pkg-deps

Control e2e framework -> k/k/pkg dependencies

test/e2e/framework/auth/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/autoscaling/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/config/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/debug/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/deployment/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/endpoints/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/endpointslice/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/events/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/gpu/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/ingress/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/internal/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/job/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/kubectl/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/kubelet/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/kubesystem/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/manifest/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/metrics/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/network/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/node/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/perf/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/pod/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/pod/pod_client.go

@@ -38,7 +38,6 @@ import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 
-	"k8s.io/kubernetes/pkg/util/slice"
 	"k8s.io/kubernetes/test/e2e/framework"
 )
 
@@ -313,10 +312,29 @@ func (c *PodClient) PodIsReady(ctx context.Context, name string) bool {
 	return podutils.IsPodReady(pod)
 }
 
+// RemoveString returns a newly created []string that contains all items from slice
+// that are not equal to s.
+// This code is taken from k/k/pkg/util/slice/slice.go to remove
+// e2e/framework/pod -> k/k/pkg/util/slice dependency.
+func removeString(slice []string, s string) []string {
+	newSlice := make([]string, 0)
+	for _, item := range slice {
+		if item != s {
+			newSlice = append(newSlice, item)
+		}
+	}
+	if len(newSlice) == 0 {
+		// Sanitize for unit tests so we don't need to distinguish empty array
+		// and nil.
+		return nil
+	}
+	return newSlice
+}
+
 // RemovePodFinalizer removes the pod's finalizer
 func (c *PodClient) RemoveFinalizer(ctx context.Context, podName string, finalizerName string) {
 	framework.Logf("Removing pod's %q finalizer: %q", podName, finalizerName)
 	c.Update(ctx, podName, func(pod *v1.Pod) {
-		pod.ObjectMeta.Finalizers = slice.RemoveString(pod.ObjectMeta.Finalizers, finalizerName, nil)
+		pod.ObjectMeta.Finalizers = removeString(pod.ObjectMeta.Finalizers, finalizerName)
 	})
 }

test/e2e/framework/providers/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/providers/gce/.import-restrictions

@@ -0,0 +1,9 @@
+# This E2E framework sub-package is currently allowed to use arbitrary
+# dependencies, therefore we need to override the restrictions from
+# the parent .import-restrictions file.
+#
+# At some point it may become useful to also check this package's
+# dependencies more careful.
+rules:
+  - selectorRegexp: ""
+    allowedPrefixes: [ "" ]

test/e2e/framework/providers/kubemark/.import-restrictions

@@ -0,0 +1,9 @@
+# This E2E framework sub-package is currently allowed to use arbitrary
+# dependencies, therefore we need to override the restrictions from
+# the parent .import-restrictions file.
+#
+# At some point it may become useful to also check this package's
+# dependencies more careful.
+rules:
+  - selectorRegexp: ""
+    allowedPrefixes: [ "" ]

test/e2e/framework/replicaset/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/resource/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/security/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/service/.import-restrictions

@@ -1,9 +1,13 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes:
+    - k8s.io/kubernetes/pkg/api/v1/pod
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/ssh/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/testfiles/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/timer/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]

test/e2e/framework/websocket/.import-restrictions

@@ -1,9 +1,12 @@
 # This E2E framework sub-package is currently allowed to use arbitrary
-# dependencies, therefore we need to override the restrictions from
+# dependencies except of k/k/pkg, therefore we need to override the
-# the parent .import-restrictions file.
+# restrictions from the parent .import-restrictions file.
 #
 # At some point it may become useful to also check this package's
 # dependencies more careful.
 rules:
+  - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
+    allowedPrefixes: []
+
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]