Merge default PodTemplate's affinity field

[devholic]

Changes

Currently, default PodTemplate's affinity field is ignored since mergePodTemplateWithDefault doesn't merge affinity field.

This PR will merge default PodTemplate's affinity field.

/kind bug

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

• Docs included if any changes are user facing
• Tests included if any functionality added or changed
• Follows the commit message standard
• Meets the Tekton contributor standards (including
  functionality, content, code)
• Release notes block below has been filled in or deleted (only if no user facing changes)

Release Notes

• Bug fixes

Fixes an issue that default PodTemplate's affinity field is ignored.

[tekton-robot]

Hi @devholic. Thanks for your PR.

I'm waiting for a tektoncd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[imjasonh]

/ok-to-test

Is there a docs update we need to make corresponding to this change?

[devholic]

@imjasonh

Is there a docs update we need to make corresponding to this change?

I think we don't have to update document since it is mentioned in Pod templates document 🙂

You also have the option to define a global Pod template in your Tekton config. However, this global template is going to be merged with any templates you specify in your TaskRuns and PipelineRuns. Any field that is present in both the global template and the TaskRun's or PipelineRun's template will be taken from the TaskRun or PipelineRun.

[imjasonh]

Thanks!

/lgtm

[vdemeester]

/lgtm

[tekton-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• pkg/apis/OWNERS [vdemeester]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[pritidesai]

/test check-pr-has-kind-label

[imjasonh]

/test pull-tekton-pipeline-alpha-integration-tests

[pritidesai]

I am guessing its a flake but wondering why are we seeing this error:

stream.go:238: Invalid log format for pod tekton-pipelines-controller-85bcd8b8d5-sh6bk: {"level":"debug","ts":"2021-12-14T21:07:14.591Z","logger":"tekton-pipelines-controller","caller":"controller/controller.go:419","msg":"Adding to queue arendelle-llsp7/pipeline-task-timeout-rwwwhmvi (depth: 2)","commit":"5e4bf68","knative.dev/controller":"github.com.tektoncd.pipeline.pkg.reconciler.pipelinerun.Reconciler","knative.dev/kind":"tekton.dev.PipelineRun","knative.dev/key":"arendelle-llsp7/pipeline-task-timeout-rwwwhmvi"}

[pritidesai]

/test pull-tekton-pipeline-alpha-integration-tests