Repository navigation
Conversation
This branch has not been deployed
This file contains hidden or 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
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.
Summary
This PR introduces a configurable
git_update_strategyproperty for Repository resources, allowing users to control how Komodo handles local, uncommitted changes when updating Git repositories.Currently, Komodo uses
git checkout -fduring repository updates. While this ensures a clean checkout, it can silently discard local changes.This becomes particularly problematic when multiple stacks share the same repository, or when applications modify tracked configuration files at runtime.
The new configuration provides three strategies while maintaining full backward compatibility.
Motivation
Consider a setup where multiple Docker stacks share a single Git repository:
automations.yamlat runtime.When Stack B is redeployed, Komodo updates the shared repository using
git checkout -f.This can silently overwrite Home Assistant's uncommitted changes, even though those files are unrelated to Stack B.
Users should be able to decide how Komodo handles these situations.
New Configuration
A new
git_update_strategyproperty is available in the Repository configuration.Example: