Tests for podTemplate on Tasks

Author: dorzel

examples/v1/pipelineruns/pipelinerun-with-matrix-on-tasks.yaml

@@ -0,0 +1,38 @@
+kind: PipelineRun
+metadata:
+  generateName: matrixed-pipelinerun-
+spec:
+  pipelineSpec:
+    tasks:
+      - name: build-and-push-manifest
+        matrix:
+          params:
+          - name: arch
+            value:
+              - "amd64"
+              - "arm64"
+        taskSpec:
+          results:
+            - name: manifest
+              type: string
+          params:
+            - name: arch
+          podTemplate:
+            nodeSelector:
+              kubernetes.io/arch: $(params.arch)
+          steps:
+            - name: build-and-push
+              image: mirror.gcr.io/ubuntu
+              script: |
+                echo "building on $(params.arch)"
+                echo "testmanifest-$(params.arch)" | tee $(results.manifest.path)
+      - name: create-manifest-list
+        params:
+          - name: manifest
+            value: $(tasks.build-and-push-manifest.results.manifest[*])
+        taskSpec:
+          steps:
+            - name: echo-manifests
+              image: mirror.gcr.io/ubuntu
+              args: ["$(params.manifest[*])"]
+              script: echo "$@"

examples/v1/taskruns/task-podtemplate.yaml

@@ -0,0 +1,18 @@
+apiVersion: tekton.dev/v1
+kind: TaskRun
+metadata:
+  name: podtemplate-task-run
+spec:
+  taskSpec:
+    params:
+      - name: arch
+        value: amd64
+    podTemplate:
+      nodeSelector:
+        kubernetes.io/arch: $(params.arch)
+    steps:
+      - name: echo
+        image: mirror.gcr.io/ubuntu
+        script: |
+          #!/usr/bin/env bash
+          echo "Hello World"

pkg/reconciler/taskrun/resources/apply_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/tektoncd/pipeline/pkg/apis/pipeline/pod"
 	v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 	"github.com/tektoncd/pipeline/pkg/reconciler/taskrun/resources"
 	"github.com/tektoncd/pipeline/pkg/workspace"
@@ -173,6 +174,17 @@ var (
 				},
 			},
 		}},
+		PodTemplate: &pod.PodTemplate{
+			NodeSelector: map[string]string{"key-$(params.FOO)": "value-$(params.FOO)"},
+			Tolerations: []corev1.Toleration{{
+				Key:      "key-$(params.FOO)",
+				Value:    "value-$(params.FOO)",
+				Effect:   corev1.TaintEffect("effect-$(params.FOO)"),
+				Operator: corev1.TolerationOperator("operator-$(params.FOO)"),
+			}},
+			SchedulerName: "name-$(params.FOO)",
+			// TODO: the rest of the fields
+		},
 	}
 
 	stepParamTaskSpec = &v1.TaskSpec{
@@ -333,6 +345,17 @@ var (
 				},
 			},
 		}},
+		PodTemplate: &pod.PodTemplate{
+			NodeSelector: map[string]string{"$(params.myObject.key1)": "$(params.myObject.key2)"},
+			Tolerations: []corev1.Toleration{{
+				Key:      "$(params.myObject.key1)",
+				Value:    "$(params.myObject.key1)",
+				Effect:   corev1.TaintEffect("$(params.myObject.key2)"),
+				Operator: corev1.TolerationOperator("$(params.myObject.key2)"),
+			}},
+			SchedulerName: "$(params.myObject.key1)",
+			// TODO: the rest of the fields
+		},
 	}
 
 	simpleTaskSpecArrayIndexing = &v1.TaskSpec{
@@ -475,6 +498,17 @@ var (
 				},
 			},
 		}},
+		PodTemplate: &pod.PodTemplate{
+			NodeSelector: map[string]string{"key2-$(params.FOO[1])": "value2-$(params.FOO[1])"},
+			Tolerations: []corev1.Toleration{{
+				Key:      "key2-$(params.FOO[1])",
+				Value:    "value2-$(params.FOO[1])",
+				Effect:   corev1.TaintEffect("effect2-$(params.FOO[1])"),
+				Operator: corev1.TolerationOperator("operator2-$(params.FOO[1])"),
+			}},
+			SchedulerName: "name2-$(params.FOO[1])",
+			// TODO: the rest of the fields
+		},
 	}
 
 	arrayParamTaskSpec = &v1.TaskSpec{
@@ -834,6 +868,15 @@ func TestApplyParameters(t *testing.T) {
 
 		spec.Sidecars[0].Image = "bar"
 		spec.Sidecars[0].Env[0].Value = "world"
+
+		spec.PodTemplate.NodeSelector = map[string]string{"key-world": "value-world"}
+		spec.PodTemplate.Tolerations[0].Effect = "effect-world"
+		spec.PodTemplate.Tolerations[0].Operator = "operator-world"
+		spec.PodTemplate.Tolerations[0].Key = "key-world"
+		spec.PodTemplate.Tolerations[0].Value = "value-world"
+		spec.PodTemplate.SchedulerName = "name-world"
+		// TODO: the rest of the fields
+
 	})
 	got := resources.ApplyParameters(simpleTaskSpec, tr, dp...)
 	if d := cmp.Diff(want, got); d != "" {
@@ -900,6 +943,15 @@ func TestApplyParameters_ArrayIndexing(t *testing.T) {
 
 		spec.Sidecars[0].Image = "bar"
 		spec.Sidecars[0].Env[0].Value = "world"
+
+		spec.PodTemplate.NodeSelector = map[string]string{"key2-world": "value2-world"}
+		spec.PodTemplate.Tolerations[0].Effect = "effect2-world"
+		spec.PodTemplate.Tolerations[0].Operator = "operator2-world"
+		spec.PodTemplate.Tolerations[0].Key = "key2-world"
+		spec.PodTemplate.Tolerations[0].Value = "value2-world"
+		spec.PodTemplate.SchedulerName = "name2-world"
+		// TODO: the rest of the fields
+
 	})
 	got := resources.ApplyParameters(simpleTaskSpecArrayIndexing, tr, dp...)
 	if d := cmp.Diff(want, got); d != "" {
@@ -966,6 +1018,15 @@ func TestApplyObjectParameters(t *testing.T) {
 		spec.Volumes[2].VolumeSource.Projected.Sources[0].ServiceAccountToken.Audience = "taskrun-value-for-key2"
 		spec.Volumes[3].VolumeSource.CSI.VolumeAttributes["secretProviderClass"] = "taskrun-value-for-key1"
 		spec.Volumes[3].VolumeSource.CSI.NodePublishSecretRef.Name = "taskrun-value-for-key1"
+
+		spec.PodTemplate.NodeSelector = map[string]string{"taskrun-value-for-key1": "taskrun-value-for-key2"}
+		spec.PodTemplate.Tolerations[0].Effect = "taskrun-value-for-key2"
+		spec.PodTemplate.Tolerations[0].Operator = "taskrun-value-for-key2"
+		spec.PodTemplate.Tolerations[0].Key = "taskrun-value-for-key1"
+		spec.PodTemplate.Tolerations[0].Value = "taskrun-value-for-key1"
+		spec.PodTemplate.SchedulerName = "taskrun-value-for-key1"
+		// TODO: the rest of the fields
+
 	})
 	got := resources.ApplyParameters(objectParamTaskSpec, tr, dp...)
 	if d := cmp.Diff(want, got); d != "" {