Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-v0.41.x] merge podTemplates instead of overriding #6862

Merged
merged 1 commit into from
Jun 26, 2023
Merged

[release-v0.41.x] merge podTemplates instead of overriding #6862

merged 1 commit into from
Jun 26, 2023

Conversation

pritidesai
Copy link
Member

Changes

This is a manual cherry-pick of #6850.

/kind bug

Submitter Checklist

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

  • Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
  • 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). See some examples of good release notes.
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

Merge podTemplate specified in pipelineRun.spec.taskRunSpecs[].podTemplate along with pipelineRun.spec.podTemplate instead of only considering the one specified at the taskRunSpecs.

@pritidesai
merge podTemplates instead of overriding
12695b3 
The podTemplate can be specified for any given pipelineTask at the
pipelineRun.spec.taskRunSpecs.

The podTemplate can also be specified for the entire pipeline at the
pipelineRun.spec.podTemplate.

Before this commit, the podTemplates at the pipelineRun level were
ignored if it was specified at the taskRunSpecs. This results in the settings
specified at the pipelineRun level not included along with the pipelineTask
specific configuration. For example, there could be a common setting at the
pipelineRun level to set the User and Group for all the pipelineTasks and
a pipelineTask can have its own diskType. Without this commit, the taskRun
runs with a podTemplate with the specified diskType and no user or group
configurations.

Signed-off-by: Priti Desai <pdesai@us.ibm.com>
@tekton-robot tekton-robot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 22, 2023
@tekton-robot
Copy link
Collaborator

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/apis/pipeline/v1/pipelinerun_types.go 89.5% 57.3% -32.2
pkg/apis/pipeline/v1beta1/pipelinerun_types.go 89.7% 88.2% -1.5

@tekton-robot
Copy link
Collaborator

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

File Old Coverage New Coverage Delta
pkg/apis/pipeline/v1/pipelinerun_types.go 89.5% 57.3% -32.2
pkg/apis/pipeline/v1beta1/pipelinerun_types.go 89.7% 88.2% -1.5

afrittoli
afrittoli reviewed Jun 26, 2023
View reviewed changes
Copy link
Member

@afrittoli afrittoli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @pritidesai , it looks good!
/approve

@tekton-robot
Copy link
Collaborator

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 26, 2023
jerop
jerop reviewed Jun 26, 2023
View reviewed changes
Copy link
Member

@jerop jerop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

thanks @pritidesai

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 26, 2023
@tekton-robot tekton-robot merged commit ee86d5d into tektoncd:release-v0.41.x Jun 26, 2023
9 of 10 checks passed
@flokain flokain mentioned this pull request Sep 19, 2023
Open
@Ma-YuXin Ma-YuXin mentioned this pull request Apr 6, 2024
Open
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@afrittoli afrittoli afrittoli left review comments

@jerop jerop jerop left review comments

@bobcatfish bobcatfish Awaiting requested review from bobcatfish

@dibyom dibyom Awaiting requested review from dibyom

Assignees

@jerop jerop

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pritidesai @tekton-robot @afrittoli @jerop