Merge pull request #11431 from elizabeth-dev/make-random-deletion-policy-prioritize-annotated-machines

k8s-ci-robot · web-flow · commit bf63a7360d0f · 2024-11-19T19:04:59.000Z
🐛 Align "random" deletion policy behavior regarding deletion annotations
diff --git a/internal/controllers/machineset/machineset_delete_policy.go b/internal/controllers/machineset/machineset_delete_policy.go
@@ -82,7 +82,7 @@ func randomDeletePolicy(machine *clusterv1.Machine) deletePriority {
 		return mustDelete
 	}
 	if _, ok := machine.ObjectMeta.Annotations[clusterv1.DeleteMachineAnnotation]; ok {
-		return betterDelete
+		return shouldDelete
 	}
 	if !isMachineHealthy(machine) {
 		return betterDelete
diff --git a/internal/controllers/machineset/machineset_delete_policy_test.go b/internal/controllers/machineset/machineset_delete_policy_test.go
@@ -200,9 +200,9 @@ func TestMachineToDelete(t *testing.T) {
 			desc: "func=randomDeletePolicy, DeleteMachineAnnotation, diff=1",
 			diff: 1,
 			machines: []*clusterv1.Machine{
-				healthyMachine,
+				betterDeleteMachine,
 				deleteMachineWithMachineAnnotation,
-				healthyMachine,
+				betterDeleteMachine,
 			},
 			expect: []*clusterv1.Machine{
 				deleteMachineWithMachineAnnotation,

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func randomDeletePolicy(machine *clusterv1.Machine) deletePriority {`
`82`	`82`	`return mustDelete`
`83`	`83`	`}`
`84`	`84`	`if _, ok := machine.ObjectMeta.Annotations[clusterv1.DeleteMachineAnnotation]; ok {`
`85`		`- return betterDelete`
	`85`	`+ return shouldDelete`
`86`	`86`	`}`
`87`	`87`	`if !isMachineHealthy(machine) {`
`88`	`88`	`return betterDelete`