From 2cb215e1091fb50a152afca3a8b2166d47f996ee Mon Sep 17 00:00:00 2001 From: Vihang Mehta Date: Fri, 5 May 2023 18:30:54 +0000 Subject: [PATCH 1/2] Add all describers to the exported DefaultObjectDescriber Signed-off-by: Vihang Mehta --- .../k8s.io/kubectl/pkg/describe/describe.go | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/describe/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/describe.go index 8b134868c33..8c889448fea 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/describe.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/describe.go @@ -381,14 +381,44 @@ var DefaultObjectDescriber ObjectDescriber func init() { d := &Describers{} err := d.Add( + describeNamespace, describeLimitRange, describeQuota, describePod, - describeService, + describeTopologySpreadConstraints, + describeVolumes, + describePersistentVolume, + describePersistentVolumeClaim, + describeContainers, + DescribeProbe, describeReplicationController, + describeReplicaSet, + describeJob, + describeCronJob, describeDaemonSet, + describeSecret, + describeIngressTLSV1beta1, + describeIngressTLSV1, + describeService, + describeEndpoints, + describeEndpointSliceV1, + describeEndpointSliceV1beta1, + describeServiceAccount, describeNode, - describeNamespace, + describeNodeLease, + describeStatefulSet, + describeCertificateSigningRequest, + describeHorizontalPodAutoscalerV2, + describeHorizontalPodAutoscalerV1, + DescribeEvents, + describeDeployment, + describeNetworkPolicy, + describeNetworkPolicySpec, + describeStorageClass, + describeCSINode, + describePodDisruptionBudgetV1, + describePodDisruptionBudgetV1beta1, + describePriorityClass, ) if err != nil { klog.Fatalf("Cannot register describers: %v", err) From 885f3d7a7dfe4eb09bef86bbeb49499ec3ff2bae Mon Sep 17 00:00:00 2001 From: Vihang Mehta Date: Wed, 17 May 2023 16:36:46 +0000 Subject: [PATCH 2/2] Sort and limit to the describers the return (string, error) Signed-off-by: Vihang Mehta --- .../k8s.io/kubectl/pkg/describe/describe.go | 47 ++++++++----------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/describe/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/describe.go index 8c889448fea..4819e95b520 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/describe.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/describe.go @@ -381,44 +381,35 @@ var DefaultObjectDescriber ObjectDescriber func init() { d := &Describers{} err := d.Add( - describeNamespace, - describeLimitRange, - describeQuota, - describePod, - describeTopologySpreadConstraints, - describeVolumes, - describePersistentVolume, - describePersistentVolumeClaim, - describeContainers, - DescribeProbe, - describeReplicationController, - describeReplicaSet, - describeJob, + describeCertificateSigningRequest, describeCronJob, + describeCSINode, describeDaemonSet, - describeSecret, - describeIngressTLSV1beta1, - describeIngressTLSV1, - describeService, + describeDeployment, describeEndpoints, describeEndpointSliceV1, describeEndpointSliceV1beta1, - describeServiceAccount, - describeNode, - describeNodeLease, - describeStatefulSet, - describeCertificateSigningRequest, - describeHorizontalPodAutoscalerV2, describeHorizontalPodAutoscalerV1, - DescribeEvents, - describeDeployment, + describeHorizontalPodAutoscalerV2, + describeJob, + describeLimitRange, + describeNamespace, describeNetworkPolicy, - describeNetworkPolicySpec, - describeStorageClass, - describeCSINode, + describeNode, + describePersistentVolume, + describePersistentVolumeClaim, + describePod, describePodDisruptionBudgetV1, describePodDisruptionBudgetV1beta1, describePriorityClass, + describeQuota, + describeReplicaSet, + describeReplicationController, + describeSecret, + describeService, + describeServiceAccount, + describeStatefulSet, + describeStorageClass, ) if err != nil { klog.Fatalf("Cannot register describers: %v", err)