From 20602c819be07e8c5e5d04048211dedb2379b6ac Mon Sep 17 00:00:00 2001
From: carlory <baofa.fan@daocloud.io>
Date: Fri, 28 Apr 2023 17:47:54 +0800
Subject: [PATCH] e2e framework: remove dependency on
 k8s.io/kubernetes/pkg/api/v1/pod

---
 test/e2e/framework/autoscaling/.import-restrictions | 3 +--
 test/e2e/framework/daemonset/fixtures.go            | 4 ++--
 test/e2e/framework/debug/.import-restrictions       | 3 +--
 test/e2e/framework/deployment/.import-restrictions  | 3 +--
 test/e2e/framework/ingress/.import-restrictions     | 3 +--
 test/e2e/framework/kubectl/.import-restrictions     | 3 +--
 test/e2e/framework/kubelet/.import-restrictions     | 3 +--
 test/e2e/framework/metrics/.import-restrictions     | 3 +--
 test/e2e/framework/network/.import-restrictions     | 3 +--
 test/e2e/framework/node/.import-restrictions        | 3 +--
 test/e2e/framework/perf/.import-restrictions        | 3 +--
 test/e2e/framework/pod/.import-restrictions         | 3 +--
 test/e2e/framework/pod/output/output.go             | 4 ++--
 test/e2e/framework/pod/wait.go                      | 3 +--
 test/e2e/framework/providers/.import-restrictions   | 3 +--
 test/e2e/framework/resource/.import-restrictions    | 3 +--
 test/e2e/framework/security/.import-restrictions    | 3 +--
 test/e2e/framework/service/.import-restrictions     | 3 +--
 18 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/test/e2e/framework/autoscaling/.import-restrictions b/test/e2e/framework/autoscaling/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/autoscaling/.import-restrictions
+++ b/test/e2e/framework/autoscaling/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/daemonset/fixtures.go b/test/e2e/framework/daemonset/fixtures.go
index a2b99eb4c5c..1bc35f2e7c4 100644
--- a/test/e2e/framework/daemonset/fixtures.go
+++ b/test/e2e/framework/daemonset/fixtures.go
@@ -24,7 +24,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
-	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
+	"k8s.io/kubectl/pkg/util/podutils"
 	"k8s.io/kubernetes/pkg/controller/daemon"
 	"k8s.io/kubernetes/test/e2e/framework"
 )
@@ -97,7 +97,7 @@ func SchedulableNodes(ctx context.Context, c clientset.Interface, ds *appsv1.Dae
 func CheckDaemonPodOnNodes(f *framework.Framework, ds *appsv1.DaemonSet, nodeNames []string) func(ctx context.Context) (bool, error) {
 	return func(ctx context.Context) (bool, error) {
 		return checkDaemonPodStateOnNodes(ctx, f.ClientSet, ds, f.Namespace.Name, nodeNames, func(pod *v1.Pod) bool {
-			return podutil.IsPodAvailable(pod, ds.Spec.MinReadySeconds, metav1.Now())
+			return podutils.IsPodAvailable(pod, ds.Spec.MinReadySeconds, metav1.Now())
 		})
 	}
 }
diff --git a/test/e2e/framework/debug/.import-restrictions b/test/e2e/framework/debug/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/debug/.import-restrictions
+++ b/test/e2e/framework/debug/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/deployment/.import-restrictions b/test/e2e/framework/deployment/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/deployment/.import-restrictions
+++ b/test/e2e/framework/deployment/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/ingress/.import-restrictions b/test/e2e/framework/ingress/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/ingress/.import-restrictions
+++ b/test/e2e/framework/ingress/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/kubectl/.import-restrictions b/test/e2e/framework/kubectl/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/kubectl/.import-restrictions
+++ b/test/e2e/framework/kubectl/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/kubelet/.import-restrictions b/test/e2e/framework/kubelet/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/kubelet/.import-restrictions
+++ b/test/e2e/framework/kubelet/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/metrics/.import-restrictions b/test/e2e/framework/metrics/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/metrics/.import-restrictions
+++ b/test/e2e/framework/metrics/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/network/.import-restrictions b/test/e2e/framework/network/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/network/.import-restrictions
+++ b/test/e2e/framework/network/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/node/.import-restrictions b/test/e2e/framework/node/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/node/.import-restrictions
+++ b/test/e2e/framework/node/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/perf/.import-restrictions b/test/e2e/framework/perf/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/perf/.import-restrictions
+++ b/test/e2e/framework/perf/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/pod/.import-restrictions b/test/e2e/framework/pod/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/pod/.import-restrictions
+++ b/test/e2e/framework/pod/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/pod/output/output.go b/test/e2e/framework/pod/output/output.go
index 6cb80f37d60..8354634329d 100644
--- a/test/e2e/framework/pod/output/output.go
+++ b/test/e2e/framework/pod/output/output.go
@@ -30,7 +30,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	clientset "k8s.io/client-go/kubernetes"
-	apiv1pod "k8s.io/kubernetes/pkg/api/v1/pod"
+	"k8s.io/kubectl/pkg/util/podutils"
 	"k8s.io/kubernetes/test/e2e/framework"
 	e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -180,7 +180,7 @@ func MatchContainerOutput(
 
 	if podErr != nil {
 		// Pod failed. Dump all logs from all containers to see what's wrong
-		_ = apiv1pod.VisitContainers(&podStatus.Spec, apiv1pod.AllFeatureEnabledContainers(), func(c *v1.Container, containerType apiv1pod.ContainerType) bool {
+		_ = podutils.VisitContainers(&podStatus.Spec, podutils.AllContainers, func(c *v1.Container, containerType podutils.ContainerType) bool {
 			logs, err := e2epod.GetPodLogs(ctx, f.ClientSet, ns, podStatus.Name, c.Name)
 			if err != nil {
 				framework.Logf("Failed to get logs from node %q pod %q container %q: %v",
diff --git a/test/e2e/framework/pod/wait.go b/test/e2e/framework/pod/wait.go
index e462cc0bc3b..5d79d959dfa 100644
--- a/test/e2e/framework/pod/wait.go
+++ b/test/e2e/framework/pod/wait.go
@@ -37,7 +37,6 @@ import (
 	apitypes "k8s.io/apimachinery/pkg/types"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubectl/pkg/util/podutils"
-	podutil "k8s.io/kubernetes/pkg/api/v1/pod"
 	"k8s.io/kubernetes/test/e2e/framework"
 	testutils "k8s.io/kubernetes/test/utils"
 	"k8s.io/kubernetes/test/utils/format"
@@ -332,7 +331,7 @@ func WaitForPods(ctx context.Context, c clientset.Interface, ns string, opts met
 // RunningReady checks whether pod p's phase is running and it has a ready
 // condition of status true.
 func RunningReady(p *v1.Pod) bool {
-	return p.Status.Phase == v1.PodRunning && podutil.IsPodReady(p)
+	return p.Status.Phase == v1.PodRunning && podutils.IsPodReady(p)
 }
 
 // WaitForPodsRunning waits for a given `timeout` to evaluate if a certain amount of pods in given `ns` are running.
diff --git a/test/e2e/framework/providers/.import-restrictions b/test/e2e/framework/providers/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/providers/.import-restrictions
+++ b/test/e2e/framework/providers/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/resource/.import-restrictions b/test/e2e/framework/resource/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/resource/.import-restrictions
+++ b/test/e2e/framework/resource/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/security/.import-restrictions b/test/e2e/framework/security/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/security/.import-restrictions
+++ b/test/e2e/framework/security/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]
diff --git a/test/e2e/framework/service/.import-restrictions b/test/e2e/framework/service/.import-restrictions
index c72fb309362..03b5ee5ec2c 100644
--- a/test/e2e/framework/service/.import-restrictions
+++ b/test/e2e/framework/service/.import-restrictions
@@ -6,8 +6,7 @@
 # dependencies more careful.
 rules:
   - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
-    allowedPrefixes:
-    - k8s.io/kubernetes/pkg/api/v1/pod
+    allowedPrefixes: []
 
   - selectorRegexp: ""
     allowedPrefixes: [ "" ]