From ca38850ab193046a45bf211d47c65b7525f84703 Mon Sep 17 00:00:00 2001 From: foxish Date: Mon, 17 Jul 2017 19:02:18 -0700 Subject: [PATCH] DS: kubectl changes --- pkg/kubectl/history.go | 2 +- pkg/kubectl/rollback.go | 2 +- pkg/kubectl/rollout_status.go | 2 +- pkg/kubectl/stop.go | 2 +- pkg/printers/internalversion/describe.go | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index beb6c0bba7e..b1feece1511 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -58,7 +58,7 @@ func HistoryViewerFor(kind schema.GroupKind, c clientset.Interface) (HistoryView return &DeploymentHistoryViewer{c}, nil case apps.Kind("StatefulSet"): return &StatefulSetHistoryViewer{c}, nil - case extensions.Kind("DaemonSet"): + case extensions.Kind("DaemonSet"), apps.Kind("DaemonSet"): return &DaemonSetHistoryViewer{c}, nil } return nil, fmt.Errorf("no history viewer has been implemented for %q", kind) diff --git a/pkg/kubectl/rollback.go b/pkg/kubectl/rollback.go index ee9594db648..5312bfbeb99 100644 --- a/pkg/kubectl/rollback.go +++ b/pkg/kubectl/rollback.go @@ -57,7 +57,7 @@ func RollbackerFor(kind schema.GroupKind, c clientset.Interface) (Rollbacker, er switch kind { case extensions.Kind("Deployment"), apps.Kind("Deployment"): return &DeploymentRollbacker{c}, nil - case extensions.Kind("DaemonSet"): + case extensions.Kind("DaemonSet"), apps.Kind("DaemonSet"): return &DaemonSetRollbacker{c}, nil } return nil, fmt.Errorf("no rollbacker has been implemented for %q", kind) diff --git a/pkg/kubectl/rollout_status.go b/pkg/kubectl/rollout_status.go index 830eabc205f..9aa64d10c9f 100644 --- a/pkg/kubectl/rollout_status.go +++ b/pkg/kubectl/rollout_status.go @@ -38,7 +38,7 @@ func StatusViewerFor(kind schema.GroupKind, c internalclientset.Interface) (Stat switch kind { case extensions.Kind("Deployment"), apps.Kind("Deployment"): return &DeploymentStatusViewer{c.Extensions()}, nil - case extensions.Kind("DaemonSet"): + case extensions.Kind("DaemonSet"), apps.Kind("DaemonSet"): return &DaemonSetStatusViewer{c.Extensions()}, nil case apps.Kind("StatefulSet"): return &StatefulSetStatusViewer{c.Apps()}, nil diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index fe28b0417db..3c4c81233ea 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -75,7 +75,7 @@ func ReaperFor(kind schema.GroupKind, c internalclientset.Interface) (Reaper, er case extensions.Kind("ReplicaSet"): return &ReplicaSetReaper{c.Extensions(), Interval, Timeout}, nil - case extensions.Kind("DaemonSet"): + case extensions.Kind("DaemonSet"), apps.Kind("DaemonSet"): return &DaemonSetReaper{c.Extensions(), Interval, Timeout}, nil case api.Kind("Pod"): diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go index 77aac5de5eb..17e0fef49ef 100644 --- a/pkg/printers/internalversion/describe.go +++ b/pkg/printers/internalversion/describe.go @@ -146,6 +146,7 @@ func describerMap(c clientset.Interface) map[schema.GroupKind]printers.Describer batch.Kind("CronJob"): &CronJobDescriber{c}, apps.Kind("StatefulSet"): &StatefulSetDescriber{c}, apps.Kind("Deployment"): &DeploymentDescriber{c, versionedClientsetForDeployment(c)}, + apps.Kind("DaemonSet"): &DaemonSetDescriber{c}, certificates.Kind("CertificateSigningRequest"): &CertificateSigningRequestDescriber{c}, storage.Kind("StorageClass"): &StorageClassDescriber{c}, policy.Kind("PodDisruptionBudget"): &PodDisruptionBudgetDescriber{c},