Merge pull request #22692 from smarterclayton/add_reason

openshift-merge-robot · web-flow · commit bbd149b09f04 · 2019-04-28T15:18:09.000-07:00
Report the pod exit reason in the event monitor
diff --git a/pkg/monitor/pod.go b/pkg/monitor/pod.go
@@ -111,7 +111,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter
 						conditions = append(conditions, Condition{
 							Level:   Error,
 							Locator: locatePodContainer(pod, s.Name),
-							Message: fmt.Sprintf("container exited with code %d: %s", t.ExitCode, t.Message),
+							Message: fmt.Sprintf("container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),
 						})
 					}
 				}
@@ -120,7 +120,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter
 						conditions = append(conditions, Condition{
 							Level:   Error,
 							Locator: locatePodContainer(pod, s.Name),
-							Message: fmt.Sprintf("init container exited with code %d: %s", t.ExitCode, t.Message),
+							Message: fmt.Sprintf("init container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),
 						})
 					}
 				}
@@ -159,7 +159,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter
 					conditions = append(conditions, Condition{
 						Level:   Error,
 						Locator: locatePodContainer(pod, s.Name),
-						Message: fmt.Sprintf("container exited with code %d: %s", t.ExitCode, t.Message),
+						Message: fmt.Sprintf("container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),
 					})
 				}
 				if s.RestartCount != previous.RestartCount {
@@ -187,7 +187,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter
 					conditions = append(conditions, Condition{
 						Level:   Error,
 						Locator: locatePodContainer(pod, s.Name),
-						Message: fmt.Sprintf("init container exited with code %d: %s", t.ExitCode, t.Message),
+						Message: fmt.Sprintf("init container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),
 					})
 				}
 				if s.RestartCount != previous.RestartCount {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter`
`111`	`111`	`conditions = append(conditions, Condition{`
`112`	`112`	`Level: Error,`
`113`	`113`	`Locator: locatePodContainer(pod, s.Name),`
`114`		`- Message: fmt.Sprintf("container exited with code %d: %s", t.ExitCode, t.Message),`
	`114`	`+ Message: fmt.Sprintf("container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),`
`115`	`115`	`})`
`116`	`116`	`}`
`117`	`117`	`}`
`@@ -120,7 +120,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter`
`120`	`120`	`conditions = append(conditions, Condition{`
`121`	`121`	`Level: Error,`
`122`	`122`	`Locator: locatePodContainer(pod, s.Name),`
`123`		`- Message: fmt.Sprintf("init container exited with code %d: %s", t.ExitCode, t.Message),`
	`123`	`+ Message: fmt.Sprintf("init container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),`
`124`	`124`	`})`
`125`	`125`	`}`
`126`	`126`	`}`
`@@ -159,7 +159,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter`
`159`	`159`	`conditions = append(conditions, Condition{`
`160`	`160`	`Level: Error,`
`161`	`161`	`Locator: locatePodContainer(pod, s.Name),`
`162`		`- Message: fmt.Sprintf("container exited with code %d: %s", t.ExitCode, t.Message),`
	`162`	`+ Message: fmt.Sprintf("container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),`
`163`	`163`	`})`
`164`	`164`	`}`
`165`	`165`	`if s.RestartCount != previous.RestartCount {`
`@@ -187,7 +187,7 @@ func startPodMonitoring(ctx context.Context, m Recorder, client kubernetes.Inter`
`187`	`187`	`conditions = append(conditions, Condition{`
`188`	`188`	`Level: Error,`
`189`	`189`	`Locator: locatePodContainer(pod, s.Name),`
`190`		`- Message: fmt.Sprintf("init container exited with code %d: %s", t.ExitCode, t.Message),`
	`190`	`+ Message: fmt.Sprintf("init container exited with code %d (%s): %s", t.ExitCode, t.Reason, t.Message),`
`191`	`191`	`})`
`192`	`192`	`}`
`193`	`193`	`if s.RestartCount != previous.RestartCount {`