add containerstate and containername for sidecars

tektoncd · Feb 19, 2020 · 5642b7b · 5642b7b
1 parent 4e9380f
commit 5642b7b
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 8 deletions.
diff --git a/pkg/apis/pipeline/v1alpha2/taskrun_types.go b/pkg/apis/pipeline/v1alpha2/taskrun_types.go
@@ -173,18 +173,20 @@ func (tr *TaskRunStatus) SetCondition(newCond *apis.Condition) {
 	}
 }
 
-// StepState reports the results of running a step in the Task.
+// StepState reports the results of running a step in a Task.
 type StepState struct {
 	corev1.ContainerState
 	Name          string `json:"name,omitempty"`
 	ContainerName string `json:"container,omitempty"`
 	ImageID       string `json:"imageID,omitempty"`
 }
 
-// SidecarState reports the results of sidecar in the Task.
+// SidecarState reports the results of running a sidecar in a Task.
 type SidecarState struct {
-	Name    string `json:"name,omitempty"`
-	ImageID string `json:"imageID,omitempty"`
+	corev1.ContainerState
+	Name          string `json:"name,omitempty"`
+	ContainerName string `json:"container,omitempty"`
+	ImageID       string `json:"imageID,omitempty"`
 }
 
 // CloudEventDelivery is the target of a cloud event along with the state of

diff --git a/pkg/apis/pipeline/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/pipeline/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/pod/status.go b/pkg/pod/status.go
@@ -158,8 +158,10 @@ func MakeTaskRunStatus(tr v1alpha1.TaskRun, pod *corev1.Pod, taskSpec v1alpha1.T
 			})
 		} else if isContainerSidecar(s.Name) {
 			trs.Sidecars = append(trs.Sidecars, v1alpha1.SidecarState{
-				Name:    trimSidecarPrefix(s.Name),
-				ImageID: s.ImageID,
+				ContainerState: *s.State.DeepCopy(),
+				Name:           trimSidecarPrefix(s.Name),
+				ContainerName:  s.Name,
+				ImageID:        s.ImageID,
 			})
 		}
 	}

diff --git a/pkg/pod/status_test.go b/pkg/pod/status_test.go
@@ -491,8 +491,112 @@ func TestMakeTaskRunStatus(t *testing.T) {
 					ContainerName: "step-running-step",
 				}},
 				Sidecars: []v1alpha1.SidecarState{{
-					Name:    "running",
-					ImageID: "image-id",
+					ContainerState: corev1.ContainerState{
+						Running: &corev1.ContainerStateRunning{},
+					},
+					Name:          "running",
+					ImageID:       "image-id",
+					ContainerName: "sidecar-running",
+				}},
+			},
+		},
+	}, {
+		desc: "with-sidecar-waiting",
+		podStatus: corev1.PodStatus{
+			Phase: corev1.PodRunning,
+			ContainerStatuses: []corev1.ContainerStatus{{
+				Name: "step-waiting-step",
+				State: corev1.ContainerState{
+					Waiting: &corev1.ContainerStateWaiting{
+						Reason:  "PodInitializing",
+						Message: "PodInitializing",
+					},
+				},
+			}, {
+				Name:    "sidecar-waiting",
+				ImageID: "image-id",
+				State: corev1.ContainerState{
+					Waiting: &corev1.ContainerStateWaiting{
+						Reason:  "PodInitializing",
+						Message: "PodInitializing",
+					},
+				},
+				Ready: true,
+			}},
+		},
+		want: v1alpha1.TaskRunStatus{
+			Status: duckv1beta1.Status{
+				Conditions: []apis.Condition{conditionRunning},
+			},
+			TaskRunStatusFields: v1alpha1.TaskRunStatusFields{
+				Steps: []v1alpha1.StepState{{
+					ContainerState: corev1.ContainerState{
+						Waiting: &corev1.ContainerStateWaiting{
+							Reason:  "PodInitializing",
+							Message: "PodInitializing",
+						},
+					},
+					Name:          "waiting-step",
+					ContainerName: "step-waiting-step",
+				}},
+				Sidecars: []v1alpha1.SidecarState{{
+					ContainerState: corev1.ContainerState{
+						Waiting: &corev1.ContainerStateWaiting{
+							Reason:  "PodInitializing",
+							Message: "PodInitializing",
+						},
+					},
+					Name:          "waiting",
+					ImageID:       "image-id",
+					ContainerName: "sidecar-waiting",
+				}},
+			},
+		},
+	}, {
+		desc: "with-sidecar-terminated",
+		podStatus: corev1.PodStatus{
+			Phase: corev1.PodRunning,
+			ContainerStatuses: []corev1.ContainerStatus{{
+				Name: "step-running-step",
+				State: corev1.ContainerState{
+					Running: &corev1.ContainerStateRunning{},
+				},
+			}, {
+				Name:    "sidecar-error",
+				ImageID: "image-id",
+				State: corev1.ContainerState{
+					Terminated: &corev1.ContainerStateTerminated{
+						ExitCode: 1,
+						Reason:   "Error",
+						Message:  "Error",
+					},
+				},
+				Ready: true,
+			}},
+		},
+		want: v1alpha1.TaskRunStatus{
+			Status: duckv1beta1.Status{
+				Conditions: []apis.Condition{conditionRunning},
+			},
+			TaskRunStatusFields: v1alpha1.TaskRunStatusFields{
+				Steps: []v1alpha1.StepState{{
+					ContainerState: corev1.ContainerState{
+						Running: &corev1.ContainerStateRunning{},
+					},
+					Name:          "running-step",
+					ContainerName: "step-running-step",
+				}},
+				Sidecars: []v1alpha1.SidecarState{{
+					ContainerState: corev1.ContainerState{
+						Terminated: &corev1.ContainerStateTerminated{
+							ExitCode: 1,
+							Reason:   "Error",
+							Message:  "Error",
+						},
+					},
+					Name:          "error",
+					ImageID:       "image-id",
+					ContainerName: "sidecar-error",
 				}},
 			},
 		},