fix: Simplify merging and fix override of top level env vars #3679
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
|
/hold Working on folding a fix for env vars in pod template containers not being overridden by pipeline/stage env vars here now. |
abayer
force-pushed
the
switch-to-strategicpatch-merge-for-containeroptions
branch
from
cbe9705
to
a05367e
Compare
houndci-bot
reviewed
Apr 18, 2019
pkg/tekton/syntax/pipeline.go
Outdated
| func scopedEnv(newEnv []corev1.EnvVar, parentEnv []corev1.EnvVar, o *RootOptions) []corev1.EnvVar { | ||
| // AddContainerEnvVarsToPipeline allows for adding a slice of container environment variables directly to the | ||
| // pipeline, if they're not already defined. | ||
| func (p *ParsedPipeline) AddContainerEnvVarsToPipeline(origEnv []corev1.EnvVar) { |
There was a problem hiding this comment.
receiver name p should be consistent with previous receiver name j for ParsedPipeline
abayer
changed the title
Derived from what I've done over at tektoncd/pipeline#767 - this is just cleaner, simpler, better.
abayer
force-pushed
the
switch-to-strategicpatch-merge-for-containeroptions
branch
from
a05367e
to
3406b37
Compare
|
/hold cancel Ok, fix for |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jstrachan 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 |
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.
Submitter checklist
Description
Derived from what I've done over at tektoncd/pipeline#767 - this is just cleaner, simpler, better.
Special notes for the reviewer(s)
/assign @dwnusbaum
Which issue this PR fixes
n/a