🌱 Improve Drain for control plane machines #11457
Merged
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
k8s-ci-robot
added
area/machine
k8s-ci-robot
added
the
size/L
fabriziopandini
force-pushed
the
improve-drain-for-cp-machines
branch
from
f3bcb52
to
ccd4b9c
Compare
|
/test pull-cluster-api-e2e-main |
chrischdi
reviewed
Nov 21, 2024
| @@ -634,6 +634,12 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, s *scope) (ctrl.Result | |||
| } | |||
|
|
|||
| func (r *Reconciler) isNodeDrainAllowed(m *clusterv1.Machine) bool { | |||
| if util.IsControlPlaneMachine(m) && util.HasOwner(m.GetOwnerReferences(), clusterv1.GroupVersion.String(), []string{"KubeadmControlPlane"}) { | |||
| if _, exists := m.Annotations[clusterv1.PreTerminateDeleteHookAnnotationPrefix+"/kcp-cleanup"]; !exists { | |||
There was a problem hiding this comment.
Q: we don't want to import controlplanev1 to prevent the go dependency right?
There was a problem hiding this comment.
Yes, that's correct.
We are trying to avoid having dependency from to core controller to KCP/CABPK
I made this more explicit like we do in other places
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: 86acea7722e6eb9f970b3ce68800e7a375dc4bbc
|
fabriziopandini
force-pushed
the
improve-drain-for-cp-machines
branch
from
ccd4b9c
to
c3904f7
Compare
k8s-ci-robot
removed
the
lgtm
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: e2687ff82b475998fffb63a4710c539aa06f39b4
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: chrischdi The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
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.
What this PR does / why we need it:
This PR prevents drain and detatch volume to happen for CP machines where KCP's PreTerminateDeleteHookAnnotation has been already removed.
This prevents drain and detach volume to spam the logs with error messages because at this stage kubelet on CP machines stops to works.
/area machine