From 918c717e57c0b6811b1b95ab6d1e09ac2f3e18b1 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Fri, 27 Dec 2024 15:24:30 +0100 Subject: [PATCH] Machine: sort list of pre-drain hooks for stable condition messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- internal/controllers/machine/machine_controller.go | 3 ++- .../machine/machine_controller_status_test.go | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/controllers/machine/machine_controller.go b/internal/controllers/machine/machine_controller.go index adbd51840684..a296365786d4 100644 --- a/internal/controllers/machine/machine_controller.go +++ b/internal/controllers/machine/machine_controller.go @@ -473,10 +473,11 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, s *scope) (ctrl.Result hooks = append(hooks, key) } } + slices.Sort(hooks) log.Info("Waiting for pre-drain hooks to succeed", "hooks", strings.Join(hooks, ",")) conditions.MarkFalse(m, clusterv1.PreDrainDeleteHookSucceededCondition, clusterv1.WaitingExternalHookReason, clusterv1.ConditionSeverityInfo, "") s.deletingReason = clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason - s.deletingMessage = fmt.Sprintf("Waiting for pre-drain hooks to complete (hooks: %s)", strings.Join(hooks, ",")) + s.deletingMessage = fmt.Sprintf("Waiting for pre-drain hooks to succeed (hooks: %s)", strings.Join(hooks, ",")) return ctrl.Result{}, nil } conditions.MarkTrue(m, clusterv1.PreDrainDeleteHookSucceededCondition) diff --git a/internal/controllers/machine/machine_controller_status_test.go b/internal/controllers/machine/machine_controller_status_test.go index 1689e0b2e1ff..275947d7880b 100644 --- a/internal/controllers/machine/machine_controller_status_test.go +++ b/internal/controllers/machine/machine_controller_status_test.go @@ -1128,12 +1128,12 @@ func TestDeletingCondition(t *testing.T) { }, reconcileDeleteExecuted: true, deletingReason: clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason, - deletingMessage: "Waiting for pre-drain hooks to complete (hooks: test-hook)", + deletingMessage: "Waiting for pre-drain hooks to succeed (hooks: test-hook)", expectCondition: metav1.Condition{ Type: clusterv1.MachineDeletingV1Beta2Condition, Status: metav1.ConditionTrue, Reason: clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason, - Message: "Waiting for pre-drain hooks to complete (hooks: test-hook)", + Message: "Waiting for pre-drain hooks to succeed (hooks: test-hook)", }, }, { @@ -1186,7 +1186,7 @@ func TestDeletingCondition(t *testing.T) { Type: clusterv1.MachineDeletingV1Beta2Condition, Status: metav1.ConditionTrue, Reason: clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason, - Message: "Waiting for pre-drain hooks to complete (hooks: test-hook)", + Message: "Waiting for pre-drain hooks to succeed (hooks: test-hook)", }, }, }, @@ -1200,7 +1200,7 @@ func TestDeletingCondition(t *testing.T) { Type: clusterv1.MachineDeletingV1Beta2Condition, Status: metav1.ConditionTrue, Reason: clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason, - Message: "Waiting for pre-drain hooks to complete (hooks: test-hook)", + Message: "Waiting for pre-drain hooks to succeed (hooks: test-hook)", }, }, } @@ -1409,7 +1409,7 @@ func TestSetReadyCondition(t *testing.T) { Type: clusterv1.MachineDeletingV1Beta2Condition, Status: metav1.ConditionTrue, Reason: clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason, - Message: "Waiting for pre-drain hooks to complete (hooks: test-hook)", + Message: "Waiting for pre-drain hooks to succeed (hooks: test-hook)", }, }, }, @@ -1788,7 +1788,7 @@ After above Pods have been removed from the Node, the following Pods will be evi Type: clusterv1.MachineDeletingV1Beta2Condition, Status: metav1.ConditionTrue, Reason: clusterv1.MachineDeletingWaitingForPreDrainHookV1Beta2Reason, - Message: "Waiting for pre-drain hooks to complete (hooks: test-hook)", + Message: "Waiting for pre-drain hooks to succeed (hooks: test-hook)", }, }, },