From 7f83e074657f08ca23a1107e9892abee1da8ee1d Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Tue, 23 Feb 2016 16:49:05 +0100 Subject: [PATCH 1/2] Added support for HPA v1 in kubectl describe --- pkg/kubectl/describe.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index e441e295152..cbc17e3b587 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -33,6 +33,7 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/unversioned" + "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/extensions" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" @@ -90,13 +91,14 @@ func describerMap(c *client.Client) map[unversioned.GroupKind]Describer { api.Kind("Endpoints"): &EndpointsDescriber{c}, api.Kind("ConfigMap"): &ConfigMapDescriber{c}, - extensions.Kind("ReplicaSet"): &ReplicaSetDescriber{c}, - extensions.Kind("HorizontalPodAutoscaler"): &HorizontalPodAutoscalerDescriber{c}, - extensions.Kind("DaemonSet"): &DaemonSetDescriber{c}, - extensions.Kind("Deployment"): &DeploymentDescriber{clientset.FromUnversionedClient(c)}, - extensions.Kind("Job"): &JobDescriber{c}, - batch.Kind("Job"): &JobDescriber{c}, - extensions.Kind("Ingress"): &IngressDescriber{c}, + extensions.Kind("ReplicaSet"): &ReplicaSetDescriber{c}, + extensions.Kind("HorizontalPodAutoscaler"): &HorizontalPodAutoscalerDescriber{c}, + autoscaling.Kind("HorizontalPodAutoscaler"): &HorizontalPodAutoscalerDescriber{c}, + extensions.Kind("DaemonSet"): &DaemonSetDescriber{c}, + extensions.Kind("Deployment"): &DeploymentDescriber{clientset.FromUnversionedClient(c)}, + extensions.Kind("Job"): &JobDescriber{c}, + batch.Kind("Job"): &JobDescriber{c}, + extensions.Kind("Ingress"): &IngressDescriber{c}, } return m From 3e023411f6f5e71fa022db52e4b6b854d6b49361 Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Tue, 23 Feb 2016 16:36:17 +0100 Subject: [PATCH 2/2] Added events to kubectl describe hpa --- contrib/completions/bash/kubectl | 1 + pkg/kubectl/describe.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/contrib/completions/bash/kubectl b/contrib/completions/bash/kubectl index 4bb1d24feb2..1f2bd42bd2e 100644 --- a/contrib/completions/bash/kubectl +++ b/contrib/completions/bash/kubectl @@ -392,6 +392,7 @@ _kubectl_describe() must_have_one_noun+=("deployment") must_have_one_noun+=("endpoints") must_have_one_noun+=("horizontalpodautoscaler") + must_have_one_noun+=("horizontalpodautoscaler") must_have_one_noun+=("ingress") must_have_one_noun+=("job") must_have_one_noun+=("job") diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index cbc17e3b587..07462a55b32 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -1587,6 +1587,11 @@ func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string) (str fmt.Fprintf(out, "failed to check Replication Controller\n") } } + + events, _ := d.client.Events(namespace).Search(hpa) + if events != nil { + DescribeEvents(events, out) + } return nil }) }