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.

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

Respect and support service extensions in environment overrides #362

Merged
merged 4 commits into from
Jan 7, 2021

Conversation

ezodude
Copy link
Contributor

@ezodude ezodude commented Jan 7, 2021

Resolves: #361

This PR implements the following extension strategy:

  • Service config extensions can be added to the compose sources.
  • Service config extensions can be added to the environment override files.
  • Service config extensions will always be merged back to the sources config.
    • Pre merge: If an extension does not exist in the source ... Post merge: it will be added to the source.
    • Pre merge: If an extension exists in the source ... Post merge: it will be merged in the source, with the environment
      override extension entries overriding the source's entries.
  • Extensions are not reconciled.

This strategy allows us to add extensions to environment overrides, that will persist even if they don't exist in the original compose sources. And, merge in overrides if compose sources already contain the extension.

@ezodude ezodude marked this pull request as draft January 7, 2021 13:46
@ezodude ezodude marked this pull request as ready for review January 7, 2021 15:42
@ezodude ezodude requested a review from marcinc January 7, 2021 15:43
Copy link
Contributor

@marcinc marcinc left a comment

Choose a reason for hiding this comment

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

LG. Worth adding a spec for case where extensions are only present in the override?

@ezodude ezodude requested a review from marcinc January 7, 2021 17:33
@marcinc marcinc merged commit 0970872 into master Jan 7, 2021
@marcinc marcinc deleted the es-extensions-361 branch January 7, 2021 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Respect and support service extensions in environment overrides
2 participants