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.47.x] merge podTemplates instead of overriding #6860

Merged
merged 1 commit into from
Jun 23, 2023
Merged

[release-v0.47.x] merge podTemplates instead of overriding #6860

merged 1 commit into from
Jun 23, 2023

Conversation

tekton-robot
Copy link
Collaborator

This is an automated cherry-pick of #6850

/assign pritidesai

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 override
ee99990 
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 mentioned this pull request Jun 22, 2023
Merged
7 tasks
@tekton-robot tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jun 22, 2023
@tekton-robot tekton-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 22, 2023
jerop
jerop reviewed Jun 22, 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.

/kind bug
/approve

@tekton-robot tekton-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jun 22, 2023
@tekton-robot
Copy link
Collaborator Author

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jerop

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 22, 2023
@jerop
Copy link
Member

jerop commented Jun 22, 2023

/test check-pr-has-kind-label

@tekton-robot
Copy link
Collaborator Author

@jerop: 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-beta-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
Copy link
Collaborator Author

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

@tekton-robot
Copy link
Collaborator Author

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

@pritidesai pritidesai mentioned this pull request Jun 22, 2023
Merged
7 tasks
@pritidesai
Copy link
Member

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 22, 2023
@pritidesai
Copy link
Member

/retest

1 similar comment
@pritidesai
Copy link
Member

/retest

@tekton-robot tekton-robot merged commit 7277870 into tektoncd:release-v0.47.x Jun 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jerop jerop jerop left review comments

@bobcatfish bobcatfish Awaiting requested review from bobcatfish

@lbernick lbernick Awaiting requested review from lbernick

Assignees

@pritidesai pritidesai

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.
3 participants
@tekton-robot @jerop @pritidesai