From 8f06514fe786d1da5f006d3340218ee0e9386222 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 13 Sep 2018 17:03:54 -0700 Subject: [PATCH] Removes dependency on internal version of resource --- pkg/kubectl/BUILD | 1 - pkg/kubectl/rollout_status.go | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index d9cb4e0774..49c5a40977 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -115,7 +115,6 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/api/pod:go_default_library", "//pkg/api/v1/pod:go_default_library", - "//pkg/apis/apps:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/core/v1:go_default_library", "//pkg/apis/extensions:go_default_library", diff --git a/pkg/kubectl/rollout_status.go b/pkg/kubectl/rollout_status.go index 184cb89249..65b87750ad 100644 --- a/pkg/kubectl/rollout_status.go +++ b/pkg/kubectl/rollout_status.go @@ -25,7 +25,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes" clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" - "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/pkg/kubectl/scheme" ) @@ -38,11 +37,13 @@ type StatusViewer interface { // StatusViewerFor returns a StatusViewer for the resource specified by kind. func StatusViewerFor(kind schema.GroupKind, c kubernetes.Interface) (StatusViewer, error) { switch kind { - case extensionsv1beta1.SchemeGroupVersion.WithKind("Deployment").GroupKind(), apps.Kind("Deployment"): + case extensionsv1beta1.SchemeGroupVersion.WithKind("Deployment").GroupKind(), + appsv1.SchemeGroupVersion.WithKind("Deployment").GroupKind(): return &DeploymentStatusViewer{c.AppsV1()}, nil - case extensionsv1beta1.SchemeGroupVersion.WithKind("DaemonSet").GroupKind(), apps.Kind("DaemonSet"): + case extensionsv1beta1.SchemeGroupVersion.WithKind("DaemonSet").GroupKind(), + appsv1.SchemeGroupVersion.WithKind("DaemonSet").GroupKind(): return &DaemonSetStatusViewer{c.AppsV1()}, nil - case apps.Kind("StatefulSet"): + case appsv1.SchemeGroupVersion.WithKind("StatefulSet").GroupKind(): return &StatefulSetStatusViewer{c.AppsV1()}, nil } return nil, fmt.Errorf("no status viewer has been implemented for %v", kind) @@ -141,7 +142,7 @@ func (s *StatefulSetStatusViewer) Status(obj runtime.Unstructured, revision int6 if sts.Spec.Replicas != nil && sts.Status.ReadyReplicas < *sts.Spec.Replicas { return fmt.Sprintf("Waiting for %d pods to be ready...\n", *sts.Spec.Replicas-sts.Status.ReadyReplicas), false, nil } - if sts.Spec.UpdateStrategy.Type == apps.RollingUpdateStatefulSetStrategyType && sts.Spec.UpdateStrategy.RollingUpdate != nil { + if sts.Spec.UpdateStrategy.Type == appsv1.RollingUpdateStatefulSetStrategyType && sts.Spec.UpdateStrategy.RollingUpdate != nil { if sts.Spec.Replicas != nil && sts.Spec.UpdateStrategy.RollingUpdate.Partition != nil { if sts.Status.UpdatedReplicas < (*sts.Spec.Replicas - *sts.Spec.UpdateStrategy.RollingUpdate.Partition) { return fmt.Sprintf("Waiting for partitioned roll out to finish: %d out of %d new pods have been updated...\n",