Skip to content

Fix panic on machine controller when considering affinity #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 2 commits into from
May 8, 2023
Merged

Fix panic on machine controller when considering affinity #245

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecaeb87
Fix panic with logging
vignesh-goutham May 8, 2023
fd455d0
Remove log statement
vignesh-goutham May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions controllers/cloudstackmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ||
Expand All @@ -138,7 +138,8 @@ 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)
r.Log.Info("getting affinity group name", err.Error())
return ctrl.Result{}, err
}

// Set failure domain name and owners.
Expand Down