Implement templating within containerTemplate. #1006
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
Before, ApplyReplacements() would apply templating replacements to the containers within spec.Steps, but never to the single container at spec.ContainerTemplate. Note that this didn't work earlier because containerTemplate is merged with the container spec after templating is applied. Isolate the container-specific templating in applyContainerReplacements() and apply that logic to the containerTemplate field. This addresses tektoncd#811.
|
/test pull-tekton-pipeline-integration-tests |
vdemeester
approved these changes
Jun 25, 2019
| @@ -17,6 +17,8 @@ limitations under the License. | |||
| package resources | |||
|
|
|||
| import ( | |||
| corev1 "k8s.io/api/core/v1" | |||
There was a problem hiding this comment.
nit: This import needs to be above 👼
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: EliZucker, 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 |
|
/lgtm |
This was referenced Jun 26, 2019
bobcatfish
reviewed
Jul 9, 2019
|
|
||
| // Apply variable expansion to containerTemplate fields. | ||
| if spec.ContainerTemplate != nil { | ||
| applyContainerReplacements(spec.ContainerTemplate, replacements) |
There was a problem hiding this comment.
I just realized we need to do this for stepTemplate as well @EliZucker 😅
lemme know if you don't want to do it, I can open a bug also
There was a problem hiding this comment.
whoa so fast! thanks @EliZucker :D
3 tasks
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
Taken from my commit message:
Before, ApplyReplacements() would apply templating replacements to the containers within spec.Steps, but never to the single container at spec.ContainerTemplate. Note that this didn't work earlier because containerTemplate is merged with the container specs after templating is applied.
Isolate the container-specific templating in applyContainerReplacements()
and apply that logic to the containerTemplate field.
This addresses #811.
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.
Release Notes
I modeled the note above from this similar PR for consistency.