github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92874 from chelseychen/event-api

Browse Source 
Fix a few places where source field is empty when creating events via events/v1
This commit is contained in:
Kubernetes Prow Robot
2020-07-11 20:57:31 -07:00
committed by GitHub
parent 11348a38d7 e010436e2a
commit c23a4b08d7
16 changed files with 176 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/printers/internalversion/printers.go
View File

@@ -1757,7 +1757,7 @@ func printEvent(obj *api.Event, options printers.GenerateOptions) ([]metav1.Tabl
obj.Reason,
target,
obj.InvolvedObject.FieldPath,
formatEventSource(obj.Source),
formatEventSource(obj.Source, obj.ReportingController, obj.ReportingInstance),
strings.TrimSpace(obj.Message),
firstTimestamp,
int64(count),
@@ -2247,13 +2247,29 @@ func layoutContainerCells(containers []api.Container) (names string, images stri
return namesBuffer.String(), imagesBuffer.String()
}
// formatEventSource formats EventSource as a comma separated string excluding Host when empty
func formatEventSource(es api.EventSource) string {
EventSourceString := []string{es.Component}
if len(es.Host) > 0 {
EventSourceString = append(EventSourceString, es.Host)
// formatEventSource formats EventSource as a comma separated string excluding Host when empty.
// It uses reportingController when Source.Component is empty and reportingInstance when Source.Host is empty
func formatEventSource(es api.EventSource, reportingController, reportingInstance string) string {
return formatEventSourceComponentInstance(
firstNonEmpty(es.Component, reportingController),
firstNonEmpty(es.Host, reportingInstance),
)
}
func firstNonEmpty(ss ...string) string {
for _, s := range ss {
if len(s) > 0 {
return s
}
}
return strings.Join(EventSourceString, ", ")
return ""
}
func formatEventSourceComponentInstance(component, instance string) string {
if len(instance) == 0 {
return component
}
return component + ", " + instance
}
func printControllerRevision(obj *apps.ControllerRevision, options printers.GenerateOptions) ([]metav1.TableRow, error) {