From 9157df47e8db6e10edcd398294e6a4c04b3572e9 Mon Sep 17 00:00:00 2001 From: caiweidong Date: Sun, 8 Sep 2019 15:03:26 +0800 Subject: [PATCH] add apigroup to the data source when using kubectl describe pvc --- .../src/k8s.io/kubectl/pkg/describe/versioned/describe.go | 5 ++++- .../k8s.io/kubectl/pkg/describe/versioned/describe_test.go | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go index c0ea35af509..d487b00c832 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go @@ -1549,8 +1549,11 @@ func describePersistentVolumeClaim(pvc *corev1.PersistentVolumeClaim, events *co } if pvc.Spec.DataSource != nil { w.Write(LEVEL_0, "DataSource:\n") - w.Write(LEVEL_1, "Name:\t%v\n", pvc.Spec.DataSource.Name) + if pvc.Spec.DataSource.APIGroup != nil { + w.Write(LEVEL_1, "APIGroup:\t%v\n", *pvc.Spec.DataSource.APIGroup) + } w.Write(LEVEL_1, "Kind:\t%v\n", pvc.Spec.DataSource.Kind) + w.Write(LEVEL_1, "Name:\t%v\n", pvc.Spec.DataSource.Name) } printPodsMultiline(w, "Mounted By", mountPods) diff --git a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go index c3ad72b1588..49ddfa6f30d 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/versioned/describe_test.go @@ -1595,7 +1595,7 @@ func TestPersistentVolumeClaimDescriber(t *testing.T) { }, Status: corev1.PersistentVolumeClaimStatus{}, }, - expectedElements: []string{"\nDataSource:\n Name: srcpvc\n Kind: PersistentVolumeClaim"}, + expectedElements: []string{"\nDataSource:\n Kind: PersistentVolumeClaim\n Name: srcpvc"}, }, { name: "snapshot-datasource", @@ -1615,7 +1615,7 @@ func TestPersistentVolumeClaimDescriber(t *testing.T) { }, Status: corev1.PersistentVolumeClaimStatus{}, }, - expectedElements: []string{"DataSource:\n Name: src-snapshot\n Kind: VolumeSnapshot\n"}, + expectedElements: []string{"DataSource:\n APIGroup: snapshot.storage.k8s.io\n Kind: VolumeSnapshot\n Name: src-snapshot\n"}, }, }