From 1d2e6a3b92121adcd19552eea01555fef02d1da5 Mon Sep 17 00:00:00 2001 From: Sunghoon Kang Date: Mon, 6 Dec 2021 14:53:47 +0900 Subject: [PATCH] Merge default PodTemplate's affinity field Currently, default PodTemplate's affinity field is ignored since `mergePodTemplateWithDefault` doesn't merge `affinity` field. Signed-off-by: Sunghoon Kang --- pkg/apis/pipeline/v1beta1/taskrun_defaults.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/apis/pipeline/v1beta1/taskrun_defaults.go b/pkg/apis/pipeline/v1beta1/taskrun_defaults.go index 49931483f75..a36d596b303 100644 --- a/pkg/apis/pipeline/v1beta1/taskrun_defaults.go +++ b/pkg/apis/pipeline/v1beta1/taskrun_defaults.go @@ -90,6 +90,9 @@ func mergePodTemplateWithDefault(tpl, defaultTpl *PodTemplate) *PodTemplate { if tpl.Tolerations == nil { tpl.Tolerations = defaultTpl.Tolerations } + if tpl.Affinity == nil { + tpl.Affinity = defaultTpl.Affinity + } if tpl.SecurityContext == nil { tpl.SecurityContext = defaultTpl.SecurityContext }