Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

e2e framework: remove dependency on k8s.io/kubernetes/pkg/api/v1/pod #117670

Merged
merged 1 commit into from
May 12, 2023
Merged

e2e framework: remove dependency on k8s.io/kubernetes/pkg/api/v1/pod #117670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions test/e2e/framework/autoscaling/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
4 changes: 2 additions & 2 deletions test/e2e/framework/daemonset/fixtures.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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())
})
}
}
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/framework/debug/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/deployment/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/ingress/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/kubectl/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/kubelet/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/metrics/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/network/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/node/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/perf/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/pod/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
4 changes: 2 additions & 2 deletions test/e2e/framework/pod/output/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/framework/pod/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/framework/providers/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/resource/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/security/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]
3 changes: 1 addition & 2 deletions test/e2e/framework/service/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# dependencies more careful.
rules:
- selectorRegexp: "^k8s[.]io/kubernetes/pkg"
allowedPrefixes:
- k8s.io/kubernetes/pkg/api/v1/pod
allowedPrefixes: []

- selectorRegexp: ""
allowedPrefixes: [ "" ]