Merge Labels and Annotations instead of override

[vdemeester]

Changes

When the PipelineRun controller updates labels, it does override whatever it fetched using the client. This means, if the labels where updated during the reconciliation, the controller will override them (possibly loosing some information). This can happen on "not so quick" reconciliation loop, for example, when fetching bundles.

This is also true for TaskRun, and this fixes it for both.

/kind bug

This affects all version of Tekton since 2020 🙃. Because this is a race, this is very hard to actually test 🙃.

Signed-off-by: Vincent Demeester vdemeest@redhat.com

Submitter Checklist

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

• Has Docs included if any changes are user facing
• Has Tests included if any functionality added or changed
• Follows the commit message standard
• Meets the Tekton contributor standards (including
  functionality, content, code)
• Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
• Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings)
• Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

The `PipelineRun` and `TaskRun` controller will not override label set by other tools during the reconciler loop, and will merge them instead

[tekton-robot]

The following is the coverage report on the affected files.
Say /test pull-tekton-pipeline-go-coverage to re-run this coverage report

File	Old Coverage	New Coverage	Delta
pkg/reconciler/pipelinerun/pipelinerun.go	85.0%	85.2%	0.2
pkg/reconciler/taskrun/taskrun.go	81.4%	81.7%	0.3

[vdemeester]

/cc @afrittoli @abayer @imjasonh

[imjasonh]

/lgtm

[tekton-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abayer

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:

• OWNERS [abayer]

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

[abayer]

/test check-pr-has-kind-label

[tekton-robot]

@abayer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

• /test pull-tekton-pipeline-alpha-integration-tests
• /test pull-tekton-pipeline-build-tests
• /test pull-tekton-pipeline-integration-tests
• /test tekton-pipeline-unit-tests

The following commands are available to trigger optional jobs:

• /test pull-tekton-pipeline-go-coverage

Use /test all to run all jobs.

In response to this:

/test check-pr-has-kind-label

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.

[tekton-robot]

The following Tekton test failed:

Test name	Commit	Details	Required	Rerun command
check-pr-has-kind-label	4c3e32e	link	true	/test check-pr-has-kind-label