github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 20:42:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117670 from carlory/fix-issue-117583

Browse Source 
e2e framework: remove dependency on k8s.io/kubernetes/pkg/api/v1/pod
This commit is contained in:
Kubernetes Prow Robot 2023-05-12 09:39:01 -07:00 committed by GitHub
commit c72bedb6cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/framework/autoscaling/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

4
test/e2e/framework/daemonset/fixtures.go
View File

@ -24,7 +24,7 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clientset "k8s.io/client-go/kubernetes" 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/pkg/controller/daemon"
"k8s.io/kubernetes/test/e2e/framework" "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) { func CheckDaemonPodOnNodes(f *framework.Framework, ds *appsv1.DaemonSet, nodeNames []string) func(ctx context.Context) (bool, error) {
return 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 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())
}) })
} }
} }

3
test/e2e/framework/debug/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/deployment/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/ingress/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/kubectl/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/kubelet/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/metrics/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/network/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/node/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/perf/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/pod/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

4
test/e2e/framework/pod/output/output.go
View File

@ -30,7 +30,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
clientset "k8s.io/client-go/kubernetes" 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" "k8s.io/kubernetes/test/e2e/framework"
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@ -180,7 +180,7 @@ func MatchContainerOutput(
if podErr != nil { if podErr != nil {
// Pod failed. Dump all logs from all containers to see what's wrong // 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) logs, err := e2epod.GetPodLogs(ctx, f.ClientSet, ns, podStatus.Name, c.Name)
if err != nil { if err != nil {
framework.Logf("Failed to get logs from node %q pod %q container %q: %v", framework.Logf("Failed to get logs from node %q pod %q container %q: %v",

3
test/e2e/framework/pod/wait.go
View File

@ -37,7 +37,6 @@ import (
apitypes "k8s.io/apimachinery/pkg/types" apitypes "k8s.io/apimachinery/pkg/types"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubectl/pkg/util/podutils"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
testutils "k8s.io/kubernetes/test/utils" testutils "k8s.io/kubernetes/test/utils"
"k8s.io/kubernetes/test/utils/format" "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 // RunningReady checks whether pod p's phase is running and it has a ready
// condition of status true. // condition of status true.
func RunningReady(p *v1.Pod) bool { 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. // WaitForPodsRunning waits for a given `timeout` to evaluate if a certain amount of pods in given `ns` are running.

3
test/e2e/framework/providers/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/resource/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/security/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]

3
test/e2e/framework/service/.import-restrictions
View File

@ -6,8 +6,7 @@
# dependencies more careful. # dependencies more careful.
rules: rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg" - selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes: allowedPrefixes: []
- k8s.io/kubernetes/pkg/api/v1/pod
- selectorRegexp: "" - selectorRegexp: ""
allowedPrefixes: [ "" ] allowedPrefixes: [ "" ]