From 8551049ba9dbb25ae9e6632b3e4c55905e57857d Mon Sep 17 00:00:00 2001
From: Maciej Pytel <maciekpytel@google.com>
Date: Mon, 6 Mar 2017 15:07:48 +0100
Subject: [PATCH] Include events when describing configmap

---
 pkg/printers/internalversion/describe.go      | 14 +++++++++-----
 pkg/printers/internalversion/describe_test.go |  8 ++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go
index b3db0b94425..c50db6968b9 100644
--- a/pkg/printers/internalversion/describe.go
+++ b/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
 	})
 }
diff --git a/pkg/printers/internalversion/describe_test.go b/pkg/printers/internalversion/describe_test.go
index 20bddd6b299..874f6db7ee9 100644
--- a/pkg/printers/internalversion/describe_test.go
+++ b/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 {