Clean up controlnode if machine related to K0sControlPlane is deleted #790
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
apedriza
commented
Oct 22, 2024
| @@ -406,6 +406,10 @@ func (c *K0sController) reconcileMachines(ctx context.Context, cluster *clusterv | |||
| return replicasToReport, fmt.Errorf("error marking controlnode to leave: %w", err) | |||
| } | |||
|
|
|||
| if err := c.deleteControlNode(ctx, name, kubeClient); err != nil { | |||
There was a problem hiding this comment.
@makhov I did not see logic reacting to this https://github.com/k0sproject/k0smotron/blob/main/internal/controller/controlplane/helper.go#L182-L189 so I thought is safe to remove controlnode at this point. WDYT?
There was a problem hiding this comment.
No, I think it's too early, let's do it at the very end, after the machine object is deleted
Signed-off-by: Adrian Pedriza <[email protected]>
apedriza
force-pushed
the
remove_controlnodes_related_to_machines
branch
from
7a79ac1 to
3b75585
Compare
makhov
approved these changes
Oct 31, 2024
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.
Fix #768
Follow up PR to k0sproject/k0s#5128. We need to use machine name as
ControlNodename in order to be able to delete it when applies