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

[Backport release-1.29] [helm] don't start reconciler before leaderelection #4848

Merged

Conversation

juanluisvaladas
Copy link
Contributor

Manual cherry-pick of #4714. The cherry pick of #4714 works automatically after cherry-picking #4039. This one however had a small conflict in go.mod and conflict in the imports of pkg/component/controller/extensions_controller.go. The changes were trivial so if it passes CI I trust it.

The backport itself is trivial. @jnummelin I assign it to you because we discussed this yesterday.

twz123 and others added 2 commits August 9, 2024 00:18
The slices package in the standard library is sufficient for k0s's
requirements nowadays. So let's use it.

Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
Prior to this commit it was possible that some charts weren't reconciled
due to lack of active leaders. See k0sproject#4637 for further details.

Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <jvaladas@mirantis.com>
@jnummelin
Copy link
Member

@juanluisvaladas Do I get it correctly, this PR now has both #4714 AND #4039 in?

@jnummelin
Copy link
Member

🤦 Looking at the commits makes it obvious that it has both those PRs cherrypicked.

@juanluisvaladas juanluisvaladas merged commit 7f41c62 into k0sproject:release-1.29 Aug 9, 2024
77 checks passed
@juanluisvaladas juanluisvaladas deleted the bp-1.29-4714 branch August 9, 2024 14:28
@juanluisvaladas juanluisvaladas restored the bp-1.29-4714 branch August 9, 2024 14:28
@juanluisvaladas juanluisvaladas deleted the bp-1.29-4714 branch August 9, 2024 14:28
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.

3 participants