Merge pull request #93 from aws/fix-affinity-group-bug

wongni · web-flow · commit 4087a2bbc38f · 2022-05-16T19:20:53.000-05:00
Fix a bug where host affinity group is created when anti is specified
diff --git a/controllers/cloudstackaffinitygroup_controller.go b/controllers/cloudstackaffinitygroup_controller.go
@@ -63,7 +63,7 @@ func (reconciler *CloudStackAffinityGroupReconciler) Reconcile(ctx context.Conte
 
 func (r *CloudStackAGReconciliationRunner) Reconcile() (ctrl.Result, error) {
 	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.AffinityGroupFinalizer)
-	affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: "host affinity"}
+	affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: r.ReconciliationSubject.Spec.Type}
 	if err := r.CSUser.GetOrCreateAffinityGroup(affinityGroup); err != nil {
 		return ctrl.Result{}, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (reconciler *CloudStackAffinityGroupReconciler) Reconcile(ctx context.Conte`
`63`	`63`
`64`	`64`	`func (r *CloudStackAGReconciliationRunner) Reconcile() (ctrl.Result, error) {`
`65`	`65`	`controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.AffinityGroupFinalizer)`
`66`		`- affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: "host affinity"}`
	`66`	`+ affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: r.ReconciliationSubject.Spec.Type}`
`67`	`67`	`if err := r.CSUser.GetOrCreateAffinityGroup(affinityGroup); err != nil {`
`68`	`68`	`return ctrl.Result{}, err`
`69`	`69`	`}`