merge podTemplates instead of overriding #6850

pritidesai · 2023-06-20T19:01:49Z

Changes

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 resulted 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 but no user or group configurations.

Fixes #6846

/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.

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 <[email protected]>

tekton-robot · 2023-06-20T19:08:25Z

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.6%	89.5%	-0.1
pkg/apis/pipeline/v1beta1/pipelinerun_types.go	89.8%	89.7%	-0.1

tekton-robot · 2023-06-20T19:11:21Z

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.6%	89.5%	-0.1
pkg/apis/pipeline/v1beta1/pipelinerun_types.go	89.8%	89.7%	-0.1

dibyom · 2023-06-21T18:14:30Z

LGTM!
cc @lbernick

tekton-robot · 2023-06-21T18:22:11Z

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.6%	89.5%	-0.1
pkg/apis/pipeline/v1beta1/pipelinerun_types.go	89.8%	89.7%	-0.1

tekton-robot · 2023-06-21T18:22:32Z

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.6%	89.5%	-0.1
pkg/apis/pipeline/v1beta1/pipelinerun_types.go	89.8%	89.7%	-0.1

pritidesai · 2023-06-21T23:15:33Z

Thanks @dibyom 👍

@tektoncd/core-maintainers please help review this 🙏 I will cherry pick this into previous LTS releases once this is merged, Thanks!

jerop

/lgtm

tekton-robot · 2023-06-22T13:24:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jerop, lbernick

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~~ [jerop,lbernick]

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

pritidesai · 2023-06-22T17:00:09Z

Since we have identified and classified this as a bug, backporting this to all active LTS releases (v0.41, v0.44, v0.47).

/cherry-pick release-v0.47.x

tekton-robot · 2023-06-22T17:00:52Z

@pritidesai: new pull request created: #6860

In response to this:

Since we have identified this a bug, backporting this to all active LTS releases (v0.41, v0.44, v0.47).

/cherry-pick release-v0.47.x

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.

pritidesai · 2023-06-22T17:01:14Z

/cherry-pick release-v0.44.x

pritidesai · 2023-06-22T17:01:44Z

/cherry-pick release-v0.41.x

tekton-robot · 2023-06-22T17:01:54Z

@pritidesai: #6850 failed to apply on top of branch "release-v0.44.x":

Applying: merge podTemplates instead of override
Using index info to reconstruct a base tree...
M	docs/pipelineruns.md
M	pkg/apis/pipeline/v1/pipelinerun_types.go
M	pkg/apis/pipeline/v1/pipelinerun_types_test.go
M	pkg/apis/pipeline/v1beta1/pipelinerun_types.go
M	pkg/apis/pipeline/v1beta1/pipelinerun_types_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/apis/pipeline/v1beta1/pipelinerun_types_test.go
Auto-merging pkg/apis/pipeline/v1beta1/pipelinerun_types.go
Auto-merging pkg/apis/pipeline/v1/pipelinerun_types_test.go
Auto-merging pkg/apis/pipeline/v1/pipelinerun_types.go
Auto-merging docs/pipelineruns.md
CONFLICT (content): Merge conflict in docs/pipelineruns.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 merge podTemplates instead of override
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.44.x

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 · 2023-06-22T17:02:27Z

@pritidesai: #6850 failed to apply on top of branch "release-v0.41.x":

Applying: merge podTemplates instead of override
Using index info to reconstruct a base tree...
M	docs/pipelineruns.md
M	pkg/apis/pipeline/v1/pipelinerun_types.go
M	pkg/apis/pipeline/v1/pipelinerun_types_test.go
M	pkg/apis/pipeline/v1beta1/pipelinerun_types.go
M	pkg/apis/pipeline/v1beta1/pipelinerun_types_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/apis/pipeline/v1beta1/pipelinerun_types_test.go
Auto-merging pkg/apis/pipeline/v1beta1/pipelinerun_types.go
Auto-merging pkg/apis/pipeline/v1/pipelinerun_types_test.go
Auto-merging pkg/apis/pipeline/v1/pipelinerun_types.go
Auto-merging docs/pipelineruns.md
CONFLICT (content): Merge conflict in docs/pipelineruns.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 merge podTemplates instead of override
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-v0.41.x

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 added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 20, 2023

tekton-robot requested review from abayer and jerop June 20, 2023 19:02

dibyom closed this Jun 21, 2023

dibyom reopened this Jun 21, 2023

lbernick approved these changes Jun 22, 2023

View reviewed changes

tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2023

jerop approved these changes Jun 22, 2023

View reviewed changes

tekton-robot assigned jerop Jun 22, 2023

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

tekton-robot merged commit 846e6b1 into tektoncd:main Jun 22, 2023

pritidesai deleted the taskrunspecs-pipelinerun-spec-podtemplate branch June 22, 2023 16:56

tekton-robot mentioned this pull request Jun 22, 2023

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

Merged

pritidesai mentioned this pull request Jun 22, 2023

[release-v0.44.x] merge podTemplates instead of override #6861

Merged

7 tasks

pritidesai mentioned this pull request Jun 22, 2023

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

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge podTemplates instead of overriding #6850

merge podTemplates instead of overriding #6850

pritidesai commented Jun 20, 2023 •

edited

Loading

tekton-robot commented Jun 20, 2023

tekton-robot commented Jun 20, 2023

dibyom commented Jun 21, 2023

tekton-robot commented Jun 21, 2023

tekton-robot commented Jun 21, 2023

pritidesai commented Jun 21, 2023

jerop left a comment

tekton-robot commented Jun 22, 2023

pritidesai commented Jun 22, 2023 •

edited

Loading

tekton-robot commented Jun 22, 2023

pritidesai commented Jun 22, 2023

pritidesai commented Jun 22, 2023

tekton-robot commented Jun 22, 2023

tekton-robot commented Jun 22, 2023

merge podTemplates instead of overriding #6850

merge podTemplates instead of overriding #6850

Conversation

pritidesai commented Jun 20, 2023 • edited Loading

Changes

Submitter Checklist

Release Notes

tekton-robot commented Jun 20, 2023

tekton-robot commented Jun 20, 2023

dibyom commented Jun 21, 2023

tekton-robot commented Jun 21, 2023

tekton-robot commented Jun 21, 2023

pritidesai commented Jun 21, 2023

jerop left a comment

Choose a reason for hiding this comment

tekton-robot commented Jun 22, 2023

pritidesai commented Jun 22, 2023 • edited Loading

tekton-robot commented Jun 22, 2023

pritidesai commented Jun 22, 2023

pritidesai commented Jun 22, 2023

tekton-robot commented Jun 22, 2023

tekton-robot commented Jun 22, 2023

pritidesai commented Jun 20, 2023 •

edited

Loading

pritidesai commented Jun 22, 2023 •

edited

Loading