Tests for podTemplate on Tasks

dorzel · dorzel · commit 1f8ab66b2eb0 · 2025-04-22T12:29:56.000-06:00
diff --git a/examples/v1/pipelineruns/pipelinerun-with-matrix-on-tasks.yaml b/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 "$@"
diff --git a/examples/v1/taskruns/task-podtemplate.yaml b/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"
diff --git a/pkg/reconciler/taskrun/resources/apply.go b/pkg/reconciler/taskrun/resources/apply.go
@@ -722,7 +722,6 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,
 				if e.ValueFrom != nil {
 					if e.ValueFrom.ConfigMapKeyRef != nil {
 						spec.PodTemplate.Env[i].ValueFrom.ConfigMapKeyRef.Key = substitution.ApplyReplacements(e.ValueFrom.ConfigMapKeyRef.Key, stringReplacements)
-						spec.PodTemplate.Env[i].ValueFrom.ConfigMapKeyRef.Name = substitution.ApplyReplacements(e.ValueFrom.ConfigMapKeyRef.Name, stringReplacements)
 						spec.PodTemplate.Env[i].ValueFrom.ConfigMapKeyRef.LocalObjectReference.Name = substitution.ApplyReplacements(e.ValueFrom.ConfigMapKeyRef.LocalObjectReference.Name, stringReplacements)
 					}
 					if e.ValueFrom.FieldRef != nil {
@@ -746,17 +745,17 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,
 				if len(spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution) > 0 {
 					for i, pst := range spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution {
 						for j, nsr := range pst.Preference.MatchExpressions {
-							spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)
-							spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))
+							spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchExpressions[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)
+							spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchExpressions[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))
 							for k, v := range nsr.Values {
-								spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
+								spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
 						}
 						for j, nsr := range pst.Preference.MatchFields {
-							spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)
-							spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))
+							spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchFields[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)
+							spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchFields[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))
 							for k, v := range nsr.Values {
-								spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
+								spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchFields[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
 						}
 					}
@@ -774,7 +773,7 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,
 							spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)
 							spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))
 							for k, v := range nsr.Values {
-								spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
+								spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
 						}
 					}
@@ -790,7 +789,6 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,
 							for k, v := range lsr.Values {
 								spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
-
 						}
 						spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchLabels = ApplyMap(wpat.PodAffinityTerm.LabelSelector.MatchLabels, stringReplacements)
 					}
@@ -818,35 +816,35 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,
 				for i, pat := range spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
 					if pat.LabelSelector != nil {
 						for j, lsr := range pat.LabelSelector.MatchExpressions {
-							spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
-							spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
+							spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
+							spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
 							for k, v := range lsr.Values {
-								spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
+								spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
 
 						}
-						spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)
+						spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)
 					}
 					for j, key := range pat.MatchLabelKeys {
-						spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
+						spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
 					}
 					for j, key := range pat.MismatchLabelKeys {
-						spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
+						spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
 					}
 					if pat.NamespaceSelector != nil {
 						for j, lsr := range pat.NamespaceSelector.MatchExpressions {
-							spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
-							spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
+							spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
+							spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
 							for k, v := range lsr.Values {
-								spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
+								spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
 						}
-						spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)
+						spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)
 					}
 					for j, ns := range pat.Namespaces {
-						spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)
+						spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)
 					}
-					spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)
+					spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)
 				}
 			}
 
@@ -887,35 +885,35 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,
 				for i, pat := range spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution {
 					if pat.LabelSelector != nil {
 						for j, lsr := range pat.LabelSelector.MatchExpressions {
-							spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
-							spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
+							spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
+							spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
 							for k, v := range lsr.Values {
-								spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
+								spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
 
 						}
-						spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)
+						spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)
 					}
 					for j, key := range pat.MatchLabelKeys {
-						spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
+						spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
 					}
 					for j, key := range pat.MismatchLabelKeys {
-						spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
+						spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)
 					}
 					if pat.NamespaceSelector != nil {
 						for j, lsr := range pat.NamespaceSelector.MatchExpressions {
-							spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
-							spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
+							spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)
+							spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))
 							for k, v := range lsr.Values {
-								spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
+								spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)
 							}
 						}
-						spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)
+						spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)
 					}
 					for j, ns := range pat.Namespaces {
-						spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)
+						spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)
 					}
-					spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)
+					spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)
 				}
 			}
 		}
diff --git a/pkg/reconciler/taskrun/resources/apply_test.go b/pkg/reconciler/taskrun/resources/apply_test.go

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,6 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,`
`722`	`722`	`if e.ValueFrom != nil {`
`723`	`723`	`if e.ValueFrom.ConfigMapKeyRef != nil {`
`724`	`724`	`spec.PodTemplate.Env[i].ValueFrom.ConfigMapKeyRef.Key = substitution.ApplyReplacements(e.ValueFrom.ConfigMapKeyRef.Key, stringReplacements)`
`725`		`- spec.PodTemplate.Env[i].ValueFrom.ConfigMapKeyRef.Name = substitution.ApplyReplacements(e.ValueFrom.ConfigMapKeyRef.Name, stringReplacements)`
`726`	`725`	`spec.PodTemplate.Env[i].ValueFrom.ConfigMapKeyRef.LocalObjectReference.Name = substitution.ApplyReplacements(e.ValueFrom.ConfigMapKeyRef.LocalObjectReference.Name, stringReplacements)`
`727`	`726`	`}`
`728`	`727`	`if e.ValueFrom.FieldRef != nil {`
`@@ -746,17 +745,17 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,`
`746`	`745`	`if len(spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution) > 0 {`
`747`	`746`	`for i, pst := range spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution {`
`748`	`747`	`for j, nsr := range pst.Preference.MatchExpressions {`
`749`		`- spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)`
`750`		`- spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))`
	`748`	`+ spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchExpressions[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)`
	`749`	`+ spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchExpressions[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))`
`751`	`750`	`for k, v := range nsr.Values {`
`752`		`- spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
	`751`	`+ spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`753`	`752`	`}`
`754`	`753`	`}`
`755`	`754`	`for j, nsr := range pst.Preference.MatchFields {`
`756`		`- spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)`
`757`		`- spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))`
	`755`	`+ spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchFields[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)`
	`756`	`+ spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchFields[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))`
`758`	`757`	`for k, v := range nsr.Values {`
`759`		`- spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
	`758`	`+ spec.PodTemplate.Affinity.NodeAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].Preference.MatchFields[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`760`	`759`	`}`
`761`	`760`	`}`
`762`	`761`	`}`
`@@ -774,7 +773,7 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,`
`774`	`773`	`spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Key = substitution.ApplyReplacements(nsr.Key, stringReplacements)`
`775`	`774`	`spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Operator = corev1.NodeSelectorOperator(substitution.ApplyReplacements(string(nsr.Operator), stringReplacements))`
`776`	`775`	`for k, v := range nsr.Values {`
`777`		`- spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
	`776`	`+ spec.PodTemplate.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[i].MatchFields[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`778`	`777`	`}`
`779`	`778`	`}`
`780`	`779`	`}`
`@@ -790,7 +789,6 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,`
`790`	`789`	`for k, v := range lsr.Values {`
`791`	`790`	`spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`792`	`791`	`}`
`793`		`-`
`794`	`792`	`}`
`795`	`793`	`spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchLabels = ApplyMap(wpat.PodAffinityTerm.LabelSelector.MatchLabels, stringReplacements)`
`796`	`794`	`}`
`@@ -818,35 +816,35 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,`
`818`	`816`	`for i, pat := range spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution {`
`819`	`817`	`if pat.LabelSelector != nil {`
`820`	`818`	`for j, lsr := range pat.LabelSelector.MatchExpressions {`
`821`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
`822`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
	`819`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
	`820`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
`823`	`821`	`for k, v := range lsr.Values {`
`824`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
	`822`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`825`	`823`	`}`
`826`	`824`
`827`	`825`	`}`
`828`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)`
	`826`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)`
`829`	`827`	`}`
`830`	`828`	`for j, key := range pat.MatchLabelKeys {`
`831`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
	`829`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
`832`	`830`	`}`
`833`	`831`	`for j, key := range pat.MismatchLabelKeys {`
`834`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
	`832`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
`835`	`833`	`}`
`836`	`834`	`if pat.NamespaceSelector != nil {`
`837`	`835`	`for j, lsr := range pat.NamespaceSelector.MatchExpressions {`
`838`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
`839`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
	`836`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
	`837`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
`840`	`838`	`for k, v := range lsr.Values {`
`841`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
	`839`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`842`	`840`	`}`
`843`	`841`	`}`
`844`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)`
	`842`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)`
`845`	`843`	`}`
`846`	`844`	`for j, ns := range pat.Namespaces {`
`847`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)`
	`845`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)`
`848`	`846`	`}`
`849`		`- spec.PodTemplate.Affinity.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)`
	`847`	`+ spec.PodTemplate.Affinity.PodAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)`
`850`	`848`	`}`
`851`	`849`	`}`
`852`	`850`
`@@ -887,35 +885,35 @@ func ApplyReplacements(spec *v1.TaskSpec, stringReplacements map[string]string,`
`887`	`885`	`for i, pat := range spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution {`
`888`	`886`	`if pat.LabelSelector != nil {`
`889`	`887`	`for j, lsr := range pat.LabelSelector.MatchExpressions {`
`890`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
`891`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
	`888`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
	`889`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
`892`	`890`	`for k, v := range lsr.Values {`
`893`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
	`891`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`894`	`892`	`}`
`895`	`893`
`896`	`894`	`}`
`897`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)`
	`895`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].LabelSelector.MatchLabels = ApplyMap(pat.LabelSelector.MatchLabels, stringReplacements)`
`898`	`896`	`}`
`899`	`897`	`for j, key := range pat.MatchLabelKeys {`
`900`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
	`898`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
`901`	`899`	`}`
`902`	`900`	`for j, key := range pat.MismatchLabelKeys {`
`903`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
	`901`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].MismatchLabelKeys[j] = substitution.ApplyReplacements(key, stringReplacements)`
`904`	`902`	`}`
`905`	`903`	`if pat.NamespaceSelector != nil {`
`906`	`904`	`for j, lsr := range pat.NamespaceSelector.MatchExpressions {`
`907`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
`908`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
	`905`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Key = substitution.ApplyReplacements(lsr.Key, stringReplacements)`
	`906`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Operator = metav1.LabelSelectorOperator(substitution.ApplyReplacements(string(lsr.Operator), stringReplacements))`
`909`	`907`	`for k, v := range lsr.Values {`
`910`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
	`908`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchExpressions[j].Values[k] = substitution.ApplyReplacements(v, stringReplacements)`
`911`	`909`	`}`
`912`	`910`	`}`
`913`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)`
	`911`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].NamespaceSelector.MatchLabels = ApplyMap(pat.NamespaceSelector.MatchLabels, stringReplacements)`
`914`	`912`	`}`
`915`	`913`	`for j, ns := range pat.Namespaces {`
`916`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)`
	`914`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].Namespaces[j] = substitution.ApplyReplacements(ns, stringReplacements)`
`917`	`915`	`}`
`918`		`- spec.PodTemplate.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution[i].PodAffinityTerm.TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)`
	`916`	`+ spec.PodTemplate.Affinity.PodAntiAffinity.RequiredDuringSchedulingIgnoredDuringExecution[i].TopologyKey = substitution.ApplyReplacements(pat.TopologyKey, stringReplacements)`
`919`	`917`	`}`
`920`	`918`	`}`
`921`	`919`	`}`