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.

Sign up for GitHub

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

Jump to bottom

Fix: remove pre-terminate drain hook for legacy CP #461

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Fix: remove pre-terminate drain hook for legacy CP #461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions controlplane/internal/controllers/rke2controlplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,13 +1000,12 @@ func (r *RKE2ControlPlaneReconciler) reconcilePreTerminateHook(ctx context.Conte

// The following will execute and remove the pre-terminate hook from the Machine.

// Skip leader change for legacy CP
_, found := controlPlane.RCP.Annotations[controlplanev1.LegacyRKE2ControlPlane]

// If we have more than 1 Machine and etcd is managed we forward etcd leadership and remove the member
// to keep the etcd cluster healthy.
if controlPlane.Machines.Len() > 1 {
if _, found := controlPlane.RCP.Annotations[controlplanev1.LegacyRKE2ControlPlane]; found {
return ctrl.Result{}, nil
}

if controlPlane.Machines.Len() > 1 && !found {
workloadCluster, err := r.GetWorkloadCluster(ctx, controlPlane)
if err != nil {
return ctrl.Result{}, errors.Wrapf(err,
Expand Down