Include events when describing configmap

pkg/printers/internalversion/describe.go

@@ -2564,10 +2564,6 @@ func (d *ConfigMapDescriber) Describe(namespace, name string, describerSettings
 		return "", err
 	}
 
-	return describeConfigMap(configMap)
-}
-
-func describeConfigMap(configMap *api.ConfigMap) (string, error) {
 	return tabbedString(func(out io.Writer) error {
 		w := NewPrefixWriter(out)
 		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", 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
 	})
 }

pkg/printers/internalversion/describe_test.go

@@ -1245,6 +1245,14 @@ func TestDescribeEvents(t *testing.T) {
 				},
 			}, events),
 		},
+		"ConfigMap": &ConfigMapDescriber{
+			fake.NewSimpleClientset(&api.ConfigMap{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "bar",
+					Namespace: "foo",
+				},
+			}, events),
+		},
 	}
 
 	for name, d := range m {