Handle non-default branches for metadata repository #64
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
This change updates the metadata class to check out the branch configured for the metadata repository when it clones the repository initially, and then to conduct only fast-forward pulls from that branch on updates. Previously, the clone operation would check out the default branch for the metadata repository (typically "main" or "master"). When it then pulls updates on the configured branch, if that branch has diverged from the main branch, then the pull command attempts to make a merge commit. In a containerized runtime environment, the Git user data is not configured, so this commit attempt fails.
|
@jberkus are you the right person to request a PR review from? Thanks! |
|
Apologies, this came in during Kubecon and I missed it. Reviewing now. |
|
LGTM |
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.
This change updates the metadata class to check out the branch configured for the metadata repository when it clones the repository initially, and then to conduct only fast-forward pulls from that branch on updates.
Previously, the clone operation would check out the default branch for the metadata repository (typically "main" or "master"). When it then pulls updates on the configured branch, if that branch has diverged from the main branch, then the pull command attempts to make a merge commit. In a containerized runtime environment, the Git user data is not configured, so this commit attempt fails.