mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
Merge pull request #42575 from MaciekPytel/show_configmap_events
Automatic merge from submit-queue Include events when describing configmap **What this PR does / why we need it**: Currently `kubectl describe configmap/xxx` does not list events, even if there are events related to this congfigmap (and --show-events=true is explicitly passed). This PR makes it include events, same as for other resource types. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note ```
This commit is contained in:
commit
2e6616dbb6
@ -2564,10 +2564,6 @@ func (d *ConfigMapDescriber) Describe(namespace, name string, describerSettings
|
|||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
return describeConfigMap(configMap)
|
|
||||||
}
|
|
||||||
|
|
||||||
func describeConfigMap(configMap *api.ConfigMap) (string, error) {
|
|
||||||
return tabbedString(func(out io.Writer) error {
|
return tabbedString(func(out io.Writer) error {
|
||||||
w := NewPrefixWriter(out)
|
w := NewPrefixWriter(out)
|
||||||
w.Write(LEVEL_0, "Name:\t%s\n", configMap.Name)
|
w.Write(LEVEL_0, "Name:\t%s\n", configMap.Name)
|
||||||
@ -2580,7 +2576,15 @@ func describeConfigMap(configMap *api.ConfigMap) (string, error) {
|
|||||||
w.Write(LEVEL_0, "%s:\n----\n", k)
|
w.Write(LEVEL_0, "%s:\n----\n", k)
|
||||||
w.Write(LEVEL_0, "%s\n", string(v))
|
w.Write(LEVEL_0, "%s\n", string(v))
|
||||||
}
|
}
|
||||||
|
if describerSettings.ShowEvents {
|
||||||
|
events, err := d.Core().Events(namespace).Search(api.Scheme, configMap)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if events != nil {
|
||||||
|
DescribeEvents(events, w)
|
||||||
|
}
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -1245,6 +1245,14 @@ func TestDescribeEvents(t *testing.T) {
|
|||||||
},
|
},
|
||||||
}, events),
|
}, events),
|
||||||
},
|
},
|
||||||
|
"ConfigMap": &ConfigMapDescriber{
|
||||||
|
fake.NewSimpleClientset(&api.ConfigMap{
|
||||||
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
|
Name: "bar",
|
||||||
|
Namespace: "foo",
|
||||||
|
},
|
||||||
|
}, events),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for name, d := range m {
|
for name, d := range m {
|
||||||
|
Loading…
Reference in New Issue
Block a user