Merge pull request #266 from gocardless/CI-1438/add-console-exit-code

Emit exit codes of console containers when terminating
gocardless · Jun 27, 2022 · 039113f · 039113f
2 parents c6396c4 + 90ae22a
commit 039113f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.8.2
+3.9.0
diff --git a/apis/workloads/v1alpha1/lifecycle_recorder.go b/apis/workloads/v1alpha1/lifecycle_recorder.go
@@ -197,17 +197,19 @@ func (l *lifecycleEventRecorderImpl) ConsoleAttach(ctx context.Context, csl *Con
 
 func (l *lifecycleEventRecorderImpl) ConsoleTerminate(ctx context.Context, csl *Console, timedOut bool, pod *corev1.Pod) error {
 	containerStatuses := make(map[string]string)
+	exitCodes := make(map[string]int32)
 	if pod != nil {
-		appendStatusMessages(containerStatuses, pod.Status.InitContainerStatuses)
-		appendStatusMessages(containerStatuses, pod.Status.ContainerStatuses)
-		appendStatusMessages(containerStatuses, pod.Status.EphemeralContainerStatuses)
+		appendStatusMessages(containerStatuses, exitCodes, pod.Status.InitContainerStatuses)
+		appendStatusMessages(containerStatuses, exitCodes, pod.Status.ContainerStatuses)
+		appendStatusMessages(containerStatuses, exitCodes, pod.Status.EphemeralContainerStatuses)
 	}
 
 	event := &events.ConsoleTerminatedEvent{
 		CommonEvent: l.makeConsoleCommonEvent(events.EventTerminated, csl),
 		Spec: events.ConsoleTerminatedSpec{
 			TimedOut:          timedOut,
 			ContainerStatuses: containerStatuses,
+			ExitCodes:         exitCodes,
 		},
 	}
 
@@ -222,7 +224,7 @@ func (l *lifecycleEventRecorderImpl) ConsoleTerminate(ctx context.Context, csl *
 	return nil
 }
 
-func appendStatusMessages(result map[string]string, containerStatuses []corev1.ContainerStatus) {
+func appendStatusMessages(containerStatusResult map[string]string, exitCodeResult map[string]int32, containerStatuses []corev1.ContainerStatus) {
 	if containerStatuses == nil {
 		return
 	}
@@ -241,7 +243,8 @@ func appendStatusMessages(result map[string]string, containerStatuses []corev1.C
 			if s.Message != "" {
 				message.WriteString(fmt.Sprintf(". Message: %s", s.Message))
 			}
-			result[containerStatus.Name] = message.String()
+			containerStatusResult[containerStatus.Name] = message.String()
+			exitCodeResult[containerStatus.Name] = s.ExitCode
 		} else if containerStatus.State.Waiting != nil {
 			s := containerStatus.State.Waiting
 			var message strings.Builder
@@ -252,7 +255,7 @@ func appendStatusMessages(result map[string]string, containerStatuses []corev1.C
 			if s.Message != "" {
 				message.WriteString(fmt.Sprintf(" Message: %s", s.Message))
 			}
-			result[containerStatus.Name] = message.String()
+			containerStatusResult[containerStatus.Name] = message.String()
 		}
 	}
 }
diff --git a/pkg/workloads/console/events/events.go b/pkg/workloads/console/events/events.go
@@ -85,6 +85,7 @@ type ConsoleAttachEvent struct {
 type ConsoleTerminatedSpec struct {
 	TimedOut          bool              `json:"timed_out"`
 	ContainerStatuses map[string]string `json:"container_statuses"`
+	ExitCodes         map[string]int32  `json:"exit_codes"`
 }
 
 type ConsoleTerminatedEvent struct {