Merge pull request kubernetes-sigs#245 from vignesh-goutham/fix-log-panic

k8s-ci-robot · web-flow · commit f1e4902b910a · 2023-05-08T10:53:40.000-07:00
Fix panic on machine controller when considering affinity
diff --git a/controllers/cloudstackmachine_controller.go b/controllers/cloudstackmachine_controller.go
@@ -128,7 +128,7 @@ func (r *CloudStackMachineReconciliationRunner) Reconcile() (retRes ctrl.Result,
 	)
 }
 
-// ConsiderAffinity sets machine affinity if needed. It also creates or gets an affinity group CRD if required and
+// ConsiderAffinity sets machine affinity if needed. It also creates or gets an affinity group resource if required and
 // checks it for readiness.
 func (r *CloudStackMachineReconciliationRunner) ConsiderAffinity() (ctrl.Result, error) {
 	if r.ReconciliationSubject.Spec.Affinity == infrav1.NoAffinity ||
@@ -138,7 +138,7 @@ func (r *CloudStackMachineReconciliationRunner) ConsiderAffinity() (ctrl.Result,
 
 	agName, err := utils.GenerateAffinityGroupName(*r.ReconciliationSubject, r.CAPIMachine)
 	if err != nil {
-		r.Log.Info("getting affinity group name", err)
+		return ctrl.Result{}, err
 	}
 
 	// Set failure domain name and owners.

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func (r *CloudStackMachineReconciliationRunner) Reconcile() (retRes ctrl.Result,`
`128`	`128`	`)`
`129`	`129`	`}`
`130`	`130`
`131`		`-// ConsiderAffinity sets machine affinity if needed. It also creates or gets an affinity group CRD if required and`
	`131`	`+// ConsiderAffinity sets machine affinity if needed. It also creates or gets an affinity group resource if required and`
`132`	`132`	`// checks it for readiness.`
`133`	`133`	`func (r *CloudStackMachineReconciliationRunner) ConsiderAffinity() (ctrl.Result, error) {`
`134`	`134`	`if r.ReconciliationSubject.Spec.Affinity == infrav1.NoAffinity \|\|`
`@@ -138,7 +138,7 @@ func (r *CloudStackMachineReconciliationRunner) ConsiderAffinity() (ctrl.Result,`
`138`	`138`
`139`	`139`	`agName, err := utils.GenerateAffinityGroupName(*r.ReconciliationSubject, r.CAPIMachine)`
`140`	`140`	`if err != nil {`
`141`		`- r.Log.Info("getting affinity group name", err)`
	`141`	`+ return ctrl.Result{}, err`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`// Set failure domain name and owners.`