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

k8s-ci-robot · web-flow · commit 3b38f5d62731 · 2024-11-27T17:00:57.000Z
🌱 machine: sort list of hooks for stable condition messages
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

Original file line number	Diff line number	Diff line change
`@@ -563,6 +563,7 @@ func (r Reconciler) reconcileDelete(ctx context.Context, s scope) (ctrl.Result`
`563`	`563`	`hooks = append(hooks, key)`
`564`	`564`	`}`
`565`	`565`	`}`
	`566`	`+ slices.Sort(hooks)`
`566`	`567`	`log.Info("Waiting for pre-terminate hooks to succeed", "hooks", strings.Join(hooks, ","))`
`567`	`568`	`conditions.MarkFalse(m, clusterv1.PreTerminateDeleteHookSucceededCondition, clusterv1.WaitingExternalHookReason, clusterv1.ConditionSeverityInfo, "")`
`568`	`569`	`s.deletingReason = clusterv1.MachineDeletingWaitingForPreTerminateHookV1Beta2Reason`