Merge pull request kubernetes-sigs#6865 from enxebre/drop-old-comment

k8s-ci-robot · web-flow · commit b1e2a3e303f8 · 2022-07-07T09:41:37.000-07:00
🌱 Fix old comment about filteredMachines
diff --git a/internal/controllers/machineset/machineset_controller.go b/internal/controllers/machineset/machineset_controller.go
@@ -248,7 +248,8 @@ func (r *Reconciler) reconcile(ctx context.Context, cluster *clusterv1.Cluster,
 		return ctrl.Result{}, errors.Wrap(err, "failed to list machines")
 	}
 
-	// Filter out irrelevant machines (deleting/mismatch labels) and claim orphaned machines.
+	// Filter out irrelevant machines (i.e. IsControlledBy something else) and claim orphaned machines.
+	// Machines in deleted state are deliberately not excluded https://github.com/kubernetes-sigs/cluster-api/pull/3434.
 	filteredMachines := make([]*clusterv1.Machine, 0, len(allMachines.Items))
 	for idx := range allMachines.Items {
 		machine := &allMachines.Items[idx]

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,8 @@ func (r Reconciler) reconcile(ctx context.Context, cluster clusterv1.Cluster,`
`248`	`248`	`return ctrl.Result{}, errors.Wrap(err, "failed to list machines")`
`249`	`249`	`}`
`250`	`250`
`251`		`- // Filter out irrelevant machines (deleting/mismatch labels) and claim orphaned machines.`
	`251`	`+ // Filter out irrelevant machines (i.e. IsControlledBy something else) and claim orphaned machines.`
	`252`	`+ // Machines in deleted state are deliberately not excluded https://github.com/kubernetes-sigs/cluster-api/pull/3434.`
`252`	`253`	`filteredMachines := make([]*clusterv1.Machine, 0, len(allMachines.Items))`
`253`	`254`	`for idx := range allMachines.Items {`
`254`	`255`	`machine := &allMachines.Items[idx]`