github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Check --show-events in kubectl describe pvc (#120380)

Browse Source 
* Check --show-events arg before fetching events

* Remove unnecessary else statement

* Add test for false show events
This commit is contained in:
Majid Garoosi 2023-09-18 11:50:30 +03:30 committed by GitHub
parent 0241da314e
commit a919079ff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/kubectl/pkg/describe/describe.go
View File

@ -1650,7 +1650,10 @@ func (d *PersistentVolumeClaimDescriber) Describe(namespace, name string, descri
return "", err
}
events, _ := searchEvents(d.CoreV1(), pvc, describerSettings.ChunkSize)
var events *corev1.EventList
if describerSettings.ShowEvents {
events, _ = searchEvents(d.CoreV1(), pvc, describerSettings.ChunkSize)
}
return describePersistentVolumeClaim(pvc, events, pods)
}

28
staging/src/k8s.io/kubectl/pkg/describe/describe_test.go
View File

@ -1765,9 +1765,11 @@ func TestPersistentVolumeClaimDescriber(t *testing.T) {
now := time.Now()
deletionTimestamp := metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}
snapshotAPIGroup := "snapshot.storage.k8s.io"
defaultDescriberSettings := &DescriberSettings{ShowEvents: true}
testCases := []struct {
name string
pvc *corev1.PersistentVolumeClaim
describerSettings *DescriberSettings
expectedElements []string
unexpectedElements []string
}{
@ -1783,6 +1785,7 @@ func TestPersistentVolumeClaimDescriber(t *testing.T) {
Phase: corev1.ClaimBound,
},
},
expectedElements: []string{"Events"},
unexpectedElements: []string{"VolumeMode", "Filesystem"},
},
{
@ -1967,13 +1970,36 @@ func TestPersistentVolumeClaimDescriber(t *testing.T) {
},
expectedElements: []string{"DataSource:\n APIGroup: snapshot.storage.k8s.io\n Kind: VolumeSnapshot\n Name: src-snapshot\n"},
},
{
name: "no-show-events",
pvc: &corev1.PersistentVolumeClaim{
ObjectMeta: metav1.ObjectMeta{Namespace: "foo", Name: "bar"},
Spec: corev1.PersistentVolumeClaimSpec{
VolumeName: "volume1",
StorageClassName: &goldClassName,
},
Status: corev1.PersistentVolumeClaimStatus{
Phase: corev1.ClaimBound,
},
},
unexpectedElements: []string{"Events"},
describerSettings: &DescriberSettings{ShowEvents: false},
},
}
for _, test := range testCases {
t.Run(test.name, func(t *testing.T) {
fake := fake.NewSimpleClientset(test.pvc)
c := PersistentVolumeClaimDescriber{fake}
str, err := c.Describe("foo", "bar", DescriberSettings{ShowEvents: true})
var describerSettings DescriberSettings
if test.describerSettings != nil {
describerSettings = *test.describerSettings
} else {
describerSettings = *defaultDescriberSettings
}
str, err := c.Describe("foo", "bar", describerSettings)
if err != nil {
t.Errorf("Unexpected error for test %s: %v", test.name, err)
}