Template Fixes #3731
Merged
Template Fixes #3731
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
k8s-ci-robot
added
cncf-cla: yes
|
/assign @gambol99 |
|
/assign @justinsb |
gambol99
force-pushed
the
template_fix
branch
from
91a936e
to
b90098a
Compare
- fixing an issue in the way it handled inline yaml documents - cleaning it up somewhat, the prior version was a little cryptic to read; it's easier to just split into docs, format and rejoin at the end
gambol99
force-pushed
the
template_fix
branch
from
b90098a
to
fad62c2
Compare
KashifSaadat
reviewed
Nov 2, 2017
| @@ -51,11 +50,10 @@ func (r *Templater) Render(content string, context map[string]interface{}, snipp | |||
|
|
|||
| // @step: add the snippits into the mix | |||
| for filename, snippet := range snippets { | |||
| name := filepath.Base(filename) | |||
There was a problem hiding this comment.
This bit resolves overloading snippets. Previously you could load two snippet files overwriting the same var and they would be applied in an inconsistent order (due to no ordering in the map), causing you to potentially have a different cluster spec generated on each run.
Thanks! :)
chrislovecnm
approved these changes
Nov 3, 2017
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chrislovecnm The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
k8s-github-robot
added
the
approved
|
/test all [submit-queue is verifying that this PR is safe to merge] |
|
Automatic merge from submit-queue. |
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.
Apologizes @justinsb ... the prior PR didn't handle YAML separators correctly; I've find it somewhat simpler by a split and join rather than using indexes and such