[Backport release-1.34] Make etcd member leave wait for controller shutdown#6922
Merged
jnummelin merged 6 commits intorelease-1.34from Jan 8, 2026
Merged
[Backport release-1.34] Make etcd member leave wait for controller shutdown#6922jnummelin merged 6 commits intorelease-1.34from
jnummelin merged 6 commits intorelease-1.34from
Conversation
…ponents It is actually a cluster component, as it reconciles other members, as well. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit 3bccdb3)
Make CRD establishment a blocking step in Start with a timeout-based failure, which will cause k0s to err out. Add startup log lines for controller/worker so readiness is visible before waiting on shutdown. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit f734957)
It's now a blocking part of the Start method, and will cause k0s to err out if the object can't be created or updated after some retries. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit 4d1e987)
…d member reconciler Replace the nested helper calls with a single loop so the control flow and restart/backoff behavior are explicit and easier to follow. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit 90ac144)
Use the trigger channel for that. Also return early and wait for a restart whenever the trigger goroutine exited unexpectedly. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit e71e50c)
Delay etcd member deletion until the target controller has stopped its own components. Use labels on the EtcdMember object for coordination, so that the CRD doesn't need to be changed, allowing this to be safely backported. Followers watch for their shutdown request and shut down k0s while leaving the process alive. Leaders continue to watch and resync EtcdMember objects, coordinating the leave flow across controllers. Pending followers only watch for shutdown. Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com> (cherry picked from commit 8ae2d45)
16 tasks
jnummelin
approved these changes
Jan 8, 2026
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
3 participants
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.
Automated backport to
release-1.34, triggered by a label in #6901.See .