diff --git a/pkg/kubectl/polymorphichelpers/attachablepodforobject.go b/pkg/kubectl/polymorphichelpers/attachablepodforobject.go index 52a4d053848..7b18111fd1f 100644 --- a/pkg/kubectl/polymorphichelpers/attachablepodforobject.go +++ b/pkg/kubectl/polymorphichelpers/attachablepodforobject.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" + "k8s.io/kubectl/pkg/util/podutils" ) // attachablePodForObject returns the pod to which to attach given an object. diff --git a/pkg/kubectl/polymorphichelpers/helpers_test.go b/pkg/kubectl/polymorphichelpers/helpers_test.go index 7afcd90c0fc..70afa2acac8 100644 --- a/pkg/kubectl/polymorphichelpers/helpers_test.go +++ b/pkg/kubectl/polymorphichelpers/helpers_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/watch" fakeexternal "k8s.io/client-go/kubernetes/fake" testcore "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" + "k8s.io/kubectl/pkg/util/podutils" ) func TestGetFirstPod(t *testing.T) { diff --git a/pkg/kubectl/polymorphichelpers/logsforobject.go b/pkg/kubectl/polymorphichelpers/logsforobject.go index cc7d23d01f8..68730191556 100644 --- a/pkg/kubectl/polymorphichelpers/logsforobject.go +++ b/pkg/kubectl/polymorphichelpers/logsforobject.go @@ -28,7 +28,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" + "k8s.io/kubectl/pkg/util/podutils" ) func logsForObject(restClientGetter genericclioptions.RESTClientGetter, object, options runtime.Object, timeout time.Duration, allContainers bool) ([]rest.ResponseWrapper, error) { diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 54f94394db8..fbd423038e7 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -34,9 +34,9 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" scaleclient "k8s.io/client-go/scale" "k8s.io/client-go/util/retry" + "k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubernetes/pkg/kubectl/util" deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" "k8s.io/utils/integer" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/kubectl/util/podutils/podutils.go b/staging/src/k8s.io/kubectl/pkg/util/podutils/podutils.go similarity index 100% rename from pkg/kubectl/util/podutils/podutils.go rename to staging/src/k8s.io/kubectl/pkg/util/podutils/podutils.go