Enhance reconcole of taskrun to avoid extra pod creation

tektoncd · Feb 11, 2020 · 85add00 · 85add00
1 parent f5217c1
commit 85add00
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go
@@ -224,7 +224,7 @@ func MakePod(images pipeline.Images, taskRun *v1alpha1.TaskRun, taskSpec v1alpha
 				*metav1.NewControllerRef(taskRun, groupVersionKind),
 			},
 			Annotations: podAnnotations,
-			Labels:      makeLabels(taskRun),
+			Labels:      MakeLabels(taskRun),
 		},
 		Spec: corev1.PodSpec{
 			RestartPolicy:                corev1.RestartPolicyNever,
@@ -247,7 +247,7 @@ func MakePod(images pipeline.Images, taskRun *v1alpha1.TaskRun, taskSpec v1alpha
 }
 
 // makeLabels constructs the labels we will propagate from TaskRuns to Pods.
-func makeLabels(s *v1alpha1.TaskRun) map[string]string {
+func MakeLabels(s *v1alpha1.TaskRun) map[string]string {
 	labels := make(map[string]string, len(s.ObjectMeta.Labels)+1)
 	// NB: Set this *before* passing through TaskRun labels. If the TaskRun
 	// has a managed-by label, it should override this default.

diff --git a/pkg/pod/pod_test.go b/pkg/pod/pod_test.go
@@ -736,7 +736,7 @@ func TestMakeLabels(t *testing.T) {
 		"foo":           "bar",
 		"hello":         "world",
 	}
-	got := makeLabels(&v1alpha1.TaskRun{
+	got := MakeLabels(&v1alpha1.TaskRun{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: taskRunName,
 			Labels: map[string]string{

diff --git a/pkg/pod/status.go b/pkg/pod/status.go
@@ -180,7 +180,7 @@ func MakeTaskRunStatus(tr v1alpha1.TaskRun, pod *corev1.Pod, taskSpec v1alpha1.T
 }
 
 func updateCompletedTaskRun(trs *v1alpha1.TaskRunStatus, pod *corev1.Pod) {
-	if didTaskRunFail(pod) {
+	if DidTaskRunFail(pod) {
 		msg := getFailureMessage(pod)
 		trs.SetCondition(&apis.Condition{
 			Type:    apis.ConditionSucceeded,
@@ -231,7 +231,8 @@ func updateIncompleteTaskRun(trs *v1alpha1.TaskRunStatus, pod *corev1.Pod) {
 	}
 }
 
-func didTaskRunFail(pod *corev1.Pod) bool {
+// DidTaskRunFail check the status of pod to decide if related taskrun is failed
+func DidTaskRunFail(pod *corev1.Pod) bool {
 	f := pod.Status.Phase == corev1.PodFailed
 	for _, s := range pod.Status.ContainerStatuses {
 		if isContainerStep(s.Name) {

diff --git a/pkg/reconciler/taskrun/taskrun.go b/pkg/reconciler/taskrun/taskrun.go
@@ -330,7 +330,22 @@ func (c *Reconciler) reconcile(ctx context.Context, tr *v1alpha1.TaskRun) error
 			c.Logger.Errorf("Error getting pod %q: %v", tr.Status.PodName, err)
 			return err
 		}
+	} else {
+		pos, err := c.KubeClientSet.CoreV1().Pods(tr.Namespace).List(metav1.ListOptions{
+			LabelSelector: getLabelSelector(tr),
+		})
+		if err != nil {
+			c.Logger.Errorf("Error listing pods: %v", err)
+			return err
+		}
+		for index := range pos.Items {
+			po := pos.Items[index]
+			if metav1.IsControlledBy(&po, tr) && !podconvert.DidTaskRunFail(&po) {
+				pod = &po
+			}
+		}
 	}
+
 	if pod == nil {
 		pod, err = c.createPod(tr, rtr)
 		if err != nil {
@@ -573,3 +588,13 @@ func resourceImplBinding(resources map[string]*v1alpha1.PipelineResource, images
 	}
 	return p, nil
 }
+
+// getLabelSelector get label of centain taskrun
+func getLabelSelector(tr *v1alpha1.TaskRun) string {
+	labels := []string{}
+	labelsMap := podconvert.MakeLabels(tr)
+	for key, value := range labelsMap {
+		labels = append(labels, fmt.Sprintf("%s=%s", key, value))
+	}
+	return strings.Join(labels, ",")
+}