Allow image name overrides in environment override files #618
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
marcinc
reviewed
Aug 19, 2021
pkg/kev/override.go
Outdated
| @@ -314,6 +314,12 @@ func (o *composeOverride) mergeServicesInto(p *ComposeProject) error { | |||
|
|
|||
| envVarsFromNilToBlankInService(base) | |||
|
|
|||
| // Copy over image name if one has bee defined in the override. In | |||
| // future this may expand to invlude other fields. | |||
| if override.Image != "" && override.Image != base.Image { | |||
There was a problem hiding this comment.
minor nitpick. It'd be better to trim whitespaces and check for length instead in this condition I think.
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.
Allow users to override the images in the environment override files, and persist these in the generated k8s manifests. This allows users to specify different images for different environments.
This change adds a new
Imagefield to theServiceConfigstruct, and modifies the post-reconciliation merging to copy over override image names, if present. Unit tests are modeled on those checking env var overrides, and ensure that the reconciliation processing does not remove any specified image names in the overrides.This PR replaces #610.