Merge pull request #94680 from ingvagabund/automated-cherry-pick-of-#…

…93687-upstream-release-1.19 Automated cherry pick of #93687: kubectl describe pod: use ReportingController as an event
kubernetes · Sep 11, 2020 · a1fade3 · a1fade3
2 parents de697e7 + 55b0dcd
commit a1fade3
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/staging/src/k8s.io/kubectl/pkg/describe/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/describe.go
@@ -3873,11 +3873,15 @@ func DescribeEvents(el *corev1.EventList, w PrefixWriter) {
 				interval = translateMicroTimestampSince(e.EventTime)
 			}
 		}
+		source := e.Source.Component
+		if source == "" {
+			source = e.ReportingController
+		}
 		w.Write(LEVEL_1, "%v\t%v\t%s\t%v\t%v\n",
 			e.Type,
 			e.Reason,
 			interval,
-			formatEventSource(e.Source),
+			source,
 			strings.TrimSpace(e.Message),
 		)
 	}
@@ -5001,15 +5005,6 @@ func translateTimestampSince(timestamp metav1.Time) string {
 	return duration.HumanDuration(time.Since(timestamp.Time))
 }
 
-// formatEventSource formats EventSource as a comma separated string excluding Host when empty
-func formatEventSource(es corev1.EventSource) string {
-	EventSourceString := []string{es.Component}
-	if len(es.Host) > 0 {
-		EventSourceString = append(EventSourceString, es.Host)
-	}
-	return strings.Join(EventSourceString, ", ")
-}
-
 // Pass ports=nil for all ports.
 func formatEndpoints(endpoints *corev1.Endpoints, ports sets.String) string {
 	if len(endpoints.Subsets) == 0 {