Merge pull request #152 from wanyufe/bugfix-clearmachine

rejoshed · web-flow · commit 154eed4f048a · 2022-08-18T13:00:35.000-07:00
Bugfix clearmachine
diff --git a/controllers/cloudstackmachine_controller.go b/controllers/cloudstackmachine_controller.go
@@ -145,7 +145,7 @@ func (r *CloudStackMachineReconciliationRunner) SetFailureDomainOnCSMachine() (r
 			name = r.CSCluster.Spec.FailureDomains[randNum].Name
 		}
 		r.ReconciliationSubject.Spec.FailureDomainName = name
-		r.ReconciliationSubject.Labels[infrav1.FailureDomainLabelName] = r.ReconciliationSubject.Spec.FailureDomainName
+		r.ReconciliationSubject.Labels[infrav1.FailureDomainLabelName] = infrav1.FailureDomainHashedMetaName(name, r.CAPICluster.Name)
 	}
 	return ctrl.Result{}, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func (r *CloudStackMachineReconciliationRunner) SetFailureDomainOnCSMachine() (r`
`145`	`145`	`name = r.CSCluster.Spec.FailureDomains[randNum].Name`
`146`	`146`	`}`
`147`	`147`	`r.ReconciliationSubject.Spec.FailureDomainName = name`
`148`		`- r.ReconciliationSubject.Labels[infrav1.FailureDomainLabelName] = r.ReconciliationSubject.Spec.FailureDomainName`
	`148`	`+ r.ReconciliationSubject.Labels[infrav1.FailureDomainLabelName] = infrav1.FailureDomainHashedMetaName(name, r.CAPICluster.Name)`
`149`	`149`	`}`
`150`	`150`	`return ctrl.Result{}, nil`
`151`	`151`	`}`