From 137cd9e6fca9c4e17328f4000a82b790676a112b Mon Sep 17 00:00:00 2001 From: Di Xu Date: Tue, 26 Sep 2017 22:30:27 +0800 Subject: [PATCH 1/2] fix missing apps/replicaset in kubectl --- pkg/kubectl/cmd/util/factory_client_access.go | 4 ++-- pkg/kubectl/delete.go | 2 +- pkg/kubectl/scale.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/util/factory_client_access.go b/pkg/kubectl/cmd/util/factory_client_access.go index 6278b5a696..9033a9828b 100644 --- a/pkg/kubectl/cmd/util/factory_client_access.go +++ b/pkg/kubectl/cmd/util/factory_client_access.go @@ -625,7 +625,7 @@ func (f *ring0Factory) Generators(cmdName string) map[string]kubectl.Generator { func (f *ring0Factory) CanBeExposed(kind schema.GroupKind) error { switch kind { case api.Kind("ReplicationController"), api.Kind("Service"), api.Kind("Pod"), - extensions.Kind("Deployment"), apps.Kind("Deployment"), extensions.Kind("ReplicaSet"): + extensions.Kind("Deployment"), apps.Kind("Deployment"), extensions.Kind("ReplicaSet"), apps.Kind("ReplicaSet"): // nothing to do here default: return fmt.Errorf("cannot expose a %s", kind) @@ -636,7 +636,7 @@ func (f *ring0Factory) CanBeExposed(kind schema.GroupKind) error { func (f *ring0Factory) CanBeAutoscaled(kind schema.GroupKind) error { switch kind { case api.Kind("ReplicationController"), extensions.Kind("ReplicaSet"), - extensions.Kind("Deployment"), apps.Kind("Deployment"): + extensions.Kind("Deployment"), apps.Kind("Deployment"), apps.Kind("ReplicaSet"): // nothing to do here default: return fmt.Errorf("cannot autoscale a %v", kind) diff --git a/pkg/kubectl/delete.go b/pkg/kubectl/delete.go index 0673b4bde6..3982bc17e7 100644 --- a/pkg/kubectl/delete.go +++ b/pkg/kubectl/delete.go @@ -72,7 +72,7 @@ func ReaperFor(kind schema.GroupKind, c internalclientset.Interface) (Reaper, er case api.Kind("ReplicationController"): return &ReplicationControllerReaper{c.Core(), Interval, Timeout}, nil - case extensions.Kind("ReplicaSet"): + case extensions.Kind("ReplicaSet"), apps.Kind("ReplicaSet"): return &ReplicaSetReaper{c.Extensions(), Interval, Timeout}, nil case extensions.Kind("DaemonSet"), apps.Kind("DaemonSet"): diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go index 9fb5fb60bb..20734bc5f7 100644 --- a/pkg/kubectl/scale.go +++ b/pkg/kubectl/scale.go @@ -54,7 +54,7 @@ func ScalerFor(kind schema.GroupKind, c internalclientset.Interface) (Scaler, er switch kind { case api.Kind("ReplicationController"): return &ReplicationControllerScaler{c.Core()}, nil - case extensions.Kind("ReplicaSet"): + case extensions.Kind("ReplicaSet"), apps.Kind("ReplicaSet"): return &ReplicaSetScaler{c.Extensions()}, nil case batch.Kind("Job"): return &JobScaler{c.Batch()}, nil // Either kind of job can be scaled with Batch interface. From 3130132542076c52cf21924089d0af4e6927c876 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Tue, 26 Sep 2017 10:53:23 -0700 Subject: [PATCH 2/2] Support apps.ReplicaSet in kubectl describe --- pkg/printers/internalversion/describe.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go index 00f6bb593e..59c2407237 100644 --- a/pkg/printers/internalversion/describe.go +++ b/pkg/printers/internalversion/describe.go @@ -153,6 +153,7 @@ func describerMap(c clientset.Interface) map[schema.GroupKind]printers.Describer apps.Kind("StatefulSet"): &StatefulSetDescriber{c}, apps.Kind("Deployment"): &DeploymentDescriber{c, versionedExtensionsClientV1beta1(c)}, apps.Kind("DaemonSet"): &DaemonSetDescriber{c}, + apps.Kind("ReplicaSet"): &ReplicaSetDescriber{c}, certificates.Kind("CertificateSigningRequest"): &CertificateSigningRequestDescriber{c}, storage.Kind("StorageClass"): &StorageClassDescriber{c}, policy.Kind("PodDisruptionBudget"): &PodDisruptionBudgetDescriber{c},