From 11c5bd1b2f884be520a1c98e70d0088fce3ebb34 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 14:20:19 -0700 Subject: [PATCH] Updated imports for util/deployment --- pkg/kubectl/describe/versioned/describe.go | 2 +- pkg/kubectl/history.go | 2 +- pkg/kubectl/rollback.go | 2 +- pkg/kubectl/rolling_updater.go | 3 ++- pkg/kubectl/rollout_status.go | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index 0ad7e070b3b..b82891bbcbc 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -65,10 +65,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/reference" "k8s.io/klog" + deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubernetes/pkg/kubectl/describe" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/certificate" - deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment" "k8s.io/kubernetes/pkg/kubectl/util/event" "k8s.io/kubernetes/pkg/kubectl/util/fieldpath" "k8s.io/kubernetes/pkg/kubectl/util/qos" diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index a1a4829aeb6..382c6dd4463 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -34,9 +34,9 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes" clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" + deploymentutil "k8s.io/kubectl/pkg/util/deployment" kapps "k8s.io/kubernetes/pkg/kubectl/apps" describe "k8s.io/kubernetes/pkg/kubectl/describe/versioned" - deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment" sliceutil "k8s.io/kubernetes/pkg/kubectl/util/slice" ) diff --git a/pkg/kubectl/rollback.go b/pkg/kubectl/rollback.go index bd7e2c7c855..63d2edd290a 100644 --- a/pkg/kubectl/rollback.go +++ b/pkg/kubectl/rollback.go @@ -32,9 +32,9 @@ import ( "k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes" + deploymentutil "k8s.io/kubectl/pkg/util/deployment" kapps "k8s.io/kubernetes/pkg/kubectl/apps" "k8s.io/kubernetes/pkg/kubectl/scheme" - deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment" ) const ( diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index fbd423038e7..3d7b15bc17e 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -34,9 +34,10 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" scaleclient "k8s.io/client-go/scale" "k8s.io/client-go/util/retry" + deploymentutil "k8s.io/kubectl/pkg/util/deployment" "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/rollout_status.go b/pkg/kubectl/rollout_status.go index 932e905175e..d6f39d71398 100644 --- a/pkg/kubectl/rollout_status.go +++ b/pkg/kubectl/rollout_status.go @@ -23,8 +23,8 @@ import ( extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubernetes/pkg/kubectl/scheme" - deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment" ) // StatusViewer provides an interface for resources that have rollout status.