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

[bootstrap] Make sure we reconcile with the right reconciliation method #3085

Merged
merged 1 commit into from
Sep 12, 2022

Conversation

souleb
Copy link
Member

@souleb souleb commented Sep 8, 2022

fixes #3065

Signed-off-by: Soule BA soule@weave.works

@stefanprodan
Copy link
Member

@souleb is this related to #3065?

@souleb souleb added bug Something isn't working area/bootstrap Bootstrap related issues and pull requests labels Sep 8, 2022
@souleb
Copy link
Member Author

souleb commented Sep 8, 2022

@souleb is this related to #3065?

yes it is. If it does work, I will do additional work on go-git-provider for some clean-up and expand test cases.

@stefanprodan
Copy link
Member

Ok so let's ask the people who reported the issue to test this before we merge it. Our e2e tests work fine without this change, so we have no means of validating this PR on our own.

Signed-off-by: Soule BA <soule@weave.works>
@souleb souleb force-pushed the reconcile-repository branch from e153382 to ec2aa13 Compare September 12, 2022 07:34
@souleb
Copy link
Member Author

souleb commented Sep 12, 2022

@hiddeco the bug described in fluxcd/go-git-providers#67 might be fixed with the change I introduced in the way we patch repository for github. Can you confirm this?

Copy link
Member

@stefanprodan stefanprodan left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks @souleb 🏅

@stefanprodan stefanprodan merged commit 0c81737 into fluxcd:main Sep 12, 2022
@stefanprodan stefanprodan deleted the reconcile-repository branch September 12, 2022 09:47
@souleb souleb restored the reconcile-repository branch September 12, 2022 10:06
@souleb souleb deleted the reconcile-repository branch September 12, 2022 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/bootstrap Bootstrap related issues and pull requests bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

flux bootstrap error after upgrading flux CLI to v0.33.0
2 participants