Merge branch 'main' into feature/add-e2e-tests

wongni · wongni · commit 66bafa5909e8 · 2022-03-09T15:11:28.000-06:00
diff --git a/controllers/cloudstackmachine_controller.go b/controllers/cloudstackmachine_controller.go
@@ -174,7 +174,7 @@ func (r *CloudStackMachineReconciler) reconcile(
 				return ctrl.Result{}, errors.Errorf("could not find zone by zoneID: %s", csMachine.Spec.ZoneID)
 			}
 		} else if csMachine.Spec.ZoneName != "" {
-			if zone := csCluster.Status.Zones.GetByName(csMachine.Spec.ZoneID); zone != nil { // ZoneName Specified.
+			if zone := csCluster.Status.Zones.GetByName(csMachine.Spec.ZoneName); zone != nil { // ZoneName Specified.
 				csMachine.Status.ZoneID = zone.ID
 			} else {
 				return ctrl.Result{}, errors.Errorf("could not find zone by zoneName: %s", csMachine.Spec.ZoneName)

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ func (r *CloudStackMachineReconciler) reconcile(`
`174`	`174`	`return ctrl.Result{}, errors.Errorf("could not find zone by zoneID: %s", csMachine.Spec.ZoneID)`
`175`	`175`	`}`
`176`	`176`	`} else if csMachine.Spec.ZoneName != "" {`
`177`		`- if zone := csCluster.Status.Zones.GetByName(csMachine.Spec.ZoneID); zone != nil { // ZoneName Specified.`
	`177`	`+ if zone := csCluster.Status.Zones.GetByName(csMachine.Spec.ZoneName); zone != nil { // ZoneName Specified.`
`178`	`178`	`csMachine.Status.ZoneID = zone.ID`
`179`	`179`	`} else {`
`180`	`180`	`return ctrl.Result{}, errors.Errorf("could not find zone by zoneName: %s", csMachine.Spec.ZoneName)`