[cherry-pick] Fix TaskRunSpec overrides when empty 🗜 #3441
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tekton-robot
added
release-note
|
/lgtm Looking Good! 🤙🏽 |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: afrittoli 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:
Approvers can indicate their approval by writing |
tekton-robot
added
the
approved
|
ah, I was too naive 😅 |
In case of TaskRunSpec being present on a PipelineRun, we override the PipelineTask PodTemplate and ServiceAccount blindly, even if those values are empty (empty string, nil point) This fixes this behavior by overriding PodTemplate and/or ServiceAccountName only when they are not empty values. Signed-off-by: Vincent Demeester <vdemeest@redhat.com> (cherry picked from commit 695d117) Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
vdemeester
force-pushed
the
3430-cherry-pick
branch
from
ca8b286
to
fa7aa64
Compare
|
/retest |
|
/lgtm Looking Good! 🤙🏽 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
In case of TaskRunSpec being present on a PipelineRun, we override the
PipelineTask PodTemplate and ServiceAccount blindly, even if those
values are empty (empty string, nil point)
This fixes this behavior by overriding PodTemplate and/or
ServiceAccountName only when they are not empty values.
Signed-off-by: Vincent Demeester vdemeest@redhat.com
(cherry picked from commit 695d117)
Signed-off-by: Vincent Demeester vdemeest@redhat.com
/kind bug
/cc @afrittoli @chmouel @sbwsg @pritidesai
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you
review them:
See the contribution guide for more details.
Double check this list of stuff that's easy to miss:
cmddir, please updatethe release Task to build and release this image.
Reviewer Notes
If API changes are included, additive changes must be approved by at least two OWNERS and backwards incompatible changes must be approved by more than 50% of the OWNERS, and they must first be added in a backwards compatible way.
Release Notes