mirror of https://github.com/k3s-io/k3s
Show events in 'kubectl describe pv'
parent
3d09b99d2c
commit
e1e9a41757
|
@ -724,6 +724,11 @@ func (d *PersistentVolumeDescriber) Describe(namespace, name string, describerSe
|
|||
|
||||
storage := pv.Spec.Capacity[api.ResourceStorage]
|
||||
|
||||
var events *api.EventList
|
||||
if describerSettings.ShowEvents {
|
||||
events, _ = d.Events(namespace).Search(pv)
|
||||
}
|
||||
|
||||
return tabbedString(func(out io.Writer) error {
|
||||
fmt.Fprintf(out, "Name:\t%s\n", pv.Name)
|
||||
printLabelsMultiline(out, "Labels", pv.Labels)
|
||||
|
@ -756,6 +761,10 @@ func (d *PersistentVolumeDescriber) Describe(namespace, name string, describerSe
|
|||
printRBDVolumeSource(pv.Spec.RBD, out)
|
||||
}
|
||||
|
||||
if events != nil {
|
||||
DescribeEvents(events, out)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
|
|
@ -626,6 +626,15 @@ func TestDescribeEvents(t *testing.T) {
|
|||
},
|
||||
}, events),
|
||||
},
|
||||
"PersistentVolumeDescriber": &PersistentVolumeDescriber{
|
||||
testclient.NewSimpleFake(&api.PersistentVolume{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
Name: "bar",
|
||||
Namespace: "foo",
|
||||
SelfLink: "url/url/url",
|
||||
},
|
||||
}, events),
|
||||
},
|
||||
"PodDescriber": &PodDescriber{
|
||||
testclient.NewSimpleFake(&api.Pod{
|
||||
ObjectMeta: api.ObjectMeta{
|
||||
|
|
Loading…
Reference in New Issue