Merge pull request #11487 from chrischdi/pr-machine-hooks-deterministic

🌱 machine: sort list of hooks for stable condition messages
kubernetes-sigs · Nov 27, 2024 · 3b38f5d · 3b38f5d
2 parents 17adbb5 + 3bf65b7
commit 3b38f5d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/internal/controllers/machine/machine_controller.go b/internal/controllers/machine/machine_controller.go
@@ -563,6 +563,7 @@ func (r *Reconciler) reconcileDelete(ctx context.Context, s *scope) (ctrl.Result
 				hooks = append(hooks, key)
 			}
 		}
+		slices.Sort(hooks)
 		log.Info("Waiting for pre-terminate hooks to succeed", "hooks", strings.Join(hooks, ","))
 		conditions.MarkFalse(m, clusterv1.PreTerminateDeleteHookSucceededCondition, clusterv1.WaitingExternalHookReason, clusterv1.ConditionSeverityInfo, "")
 		s.deletingReason = clusterv1.MachineDeletingWaitingForPreTerminateHookV1Beta2Reason