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

Fix the template merge code to support script #1649

Closed
wants to merge 1 commit into from
Closed

Fix the template merge code to support script #1649

wants to merge 1 commit into from

Conversation

afrittoli
Copy link
Member

The step template merge code assumes that Step is only a Container.
When script mode is used in combination with a stepTemplate, the
script part is lost during the template merge.

The issue is solved by adding the Script part back into the newly
created step after the container merge logic.

Fixes #1647

Changes

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:

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

Describe any user facing changes here, or delete this block.

Examples of user facing changes:
- API changes
- Bug fixes
- Any changes in behavior

@afrittoli
Fix the template merge code to support script
628a78d 
The step template merge code assumes that Step is only a Container.
When script mode is used in combination with a stepTemplate, the
script part is lost during the template merge.

The issue is solved by adding the Script part back into the newly
created step after the container merge logic.

Fixes tektoncd#1647
@googlebot googlebot added the cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit label Nov 29, 2019
@tekton-robot tekton-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 29, 2019
vdemeester
vdemeester approved these changes Nov 29, 2019
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 29, 2019
@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

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 Nov 29, 2019
@imjasonh
Copy link
Member

/hold

@tekton-robot tekton-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 29, 2019
@imjasonh
Copy link
Member

If a stepTemplate specifies command or args, those should be ignored and overridden if the step specifies a script. Does that sound right?

It’d also be great to have an e2e YAML test to avoid future regressions.

Thanks for catching this!

@afrittoli
Copy link
Member Author

/test pull-tekton-pipeline-integration-tests

@afrittoli
Copy link
Member Author

If a stepTemplate specifies command or args, those should be ignored and overridden if the step specifies a script. Does that sound right?

Yes, I think so.

It’d also be great to have an e2e YAML test to avoid future regressions.

+1000 - also for the case you mentioned above, and we should add that to the docs.

Thanks for catching this!

@afrittoli afrittoli closed this Dec 3, 2019
@afrittoli
Copy link
Member Author

This was fixed in #1653

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester vdemeester approved these changes

@dlorenc dlorenc Awaiting requested review from dlorenc

@imjasonh imjasonh Awaiting requested review from imjasonh

Assignees

@vdemeester vdemeester

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cla: yes Trying to make the CLA bot happy with ppl from different companies work on one commit do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

script mode is broken by stepTemplate
5 participants
@afrittoli @tekton-robot @imjasonh @vdemeester @googlebot