use failure domains name in spec instead of in metadata to clear machine

wanyufe · wanyufe · commit b3dd528e542a · 2022-08-18T10:37:48.000-04:00
diff --git a/controllers/cloudstackfailuredomain_controller.go b/controllers/cloudstackfailuredomain_controller.go
@@ -127,7 +127,7 @@ func (r *CloudStackFailureDomainReconciliationRunner) ReconcileDelete() (ctrl.Re
 // and requeus until all CloudStack machines are cleared from the FailureDomain.
 func (r *CloudStackFailureDomainReconciliationRunner) ClearMachines() (ctrl.Result, error) {
 	machines := &infrav1.CloudStackMachineList{}
-	if err := r.K8sClient.List(r.RequestCtx, machines, client.MatchingLabels{infrav1.FailureDomainLabelName: r.ReconciliationSubject.Name}); err != nil {
+	if err := r.K8sClient.List(r.RequestCtx, machines, client.MatchingLabels{infrav1.FailureDomainLabelName: r.ReconciliationSubject.Spec.Name}); err != nil {
 		return ctrl.Result{}, err
 	}
 	// Deleted CAPI machines for CloudStack machines found.

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ func (r *CloudStackFailureDomainReconciliationRunner) ReconcileDelete() (ctrl.Re`
`127`	`127`	`// and requeus until all CloudStack machines are cleared from the FailureDomain.`
`128`	`128`	`func (r *CloudStackFailureDomainReconciliationRunner) ClearMachines() (ctrl.Result, error) {`
`129`	`129`	`machines := &infrav1.CloudStackMachineList{}`
`130`		`- if err := r.K8sClient.List(r.RequestCtx, machines, client.MatchingLabels{infrav1.FailureDomainLabelName: r.ReconciliationSubject.Name}); err != nil {`
	`130`	`+ if err := r.K8sClient.List(r.RequestCtx, machines, client.MatchingLabels{infrav1.FailureDomainLabelName: r.ReconciliationSubject.Spec.Name}); err != nil {`
`131`	`131`	`return ctrl.Result{}, err`
`132`	`132`	`}`
`133`	`133`	`// Deleted CAPI machines for CloudStack machines found.`