generate ReportingInstance and ReportingController in Event

Kubernetes-commit: df0a25382053bb6c0f04fc4d807be6e059b552c1

tools/record/event.go

@@ -357,6 +357,9 @@ func (recorder *recorderImpl) generateEvent(object runtime.Object, annotations m
 	event := recorder.makeEvent(ref, annotations, eventtype, reason, message)
 	event.Source = recorder.source
 
+	event.ReportingInstance = recorder.source.Host
+	event.ReportingController = recorder.source.Component
+
 	// NOTE: events should be a non-blocking operation, but we also need to not
 	// put this in a goroutine, otherwise we'll race to write to a closed channel
 	// when we go to shut down this broadcaster.  Just drop events if we get overloaded,

tools/record/event_test.go

@@ -182,6 +182,7 @@ func TestEventf(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -209,6 +210,7 @@ func TestEventf(t *testing.T) {
 				Reason:              "Killed",
 				Message:             "some other verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -237,6 +239,7 @@ func TestEventf(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               2,
 				Type:                v1.EventTypeNormal,
 			},
@@ -265,6 +268,7 @@ func TestEventf(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -293,6 +297,7 @@ func TestEventf(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               3,
 				Type:                v1.EventTypeNormal,
 			},
@@ -321,6 +326,7 @@ func TestEventf(t *testing.T) {
 				Reason:              "Stopped",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -349,6 +355,7 @@ func TestEventf(t *testing.T) {
 				Reason:              "Stopped",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               2,
 				Type:                v1.EventTypeNormal,
 			},
@@ -738,6 +745,7 @@ func TestMultiSinkCache(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -765,6 +773,7 @@ func TestMultiSinkCache(t *testing.T) {
 				Reason:              "Killed",
 				Message:             "some other verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -793,6 +802,7 @@ func TestMultiSinkCache(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               2,
 				Type:                v1.EventTypeNormal,
 			},
@@ -821,6 +831,7 @@ func TestMultiSinkCache(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -849,6 +860,7 @@ func TestMultiSinkCache(t *testing.T) {
 				Reason:              "Started",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               3,
 				Type:                v1.EventTypeNormal,
 			},
@@ -877,6 +889,7 @@ func TestMultiSinkCache(t *testing.T) {
 				Reason:              "Stopped",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               1,
 				Type:                v1.EventTypeNormal,
 			},
@@ -905,6 +918,7 @@ func TestMultiSinkCache(t *testing.T) {
 				Reason:              "Stopped",
 				Message:             "some verbose message: 1",
 				Source:              v1.EventSource{Component: "eventTest"},
+				ReportingController: "eventTest",
 				Count:               2,
 				Type:                v1.EventTypeNormal,
 			},

tools/record/events_cache_test.go

@@ -115,6 +115,9 @@ func validateEvent(messagePrefix string, actualEvent *v1.Event, expectedEvent *v
 	// Temp clear time stamps for comparison because actual values don't matter for comparison
 	recvEvent.FirstTimestamp = expectedEvent.FirstTimestamp
 	recvEvent.LastTimestamp = expectedEvent.LastTimestamp
+
+	recvEvent.ReportingController = expectedEvent.ReportingController
+
 	// Check that name has the right prefix.
 	if n, en := recvEvent.Name, expectedEvent.Name; !strings.HasPrefix(n, en) {
 		t.Errorf("%v - Name '%v' does not contain prefix '%v'", messagePrefix, n, en)