refactor(openshift): use mutator interface directly

njhale · njhale · commit 54b66caf486b · 2021-04-15T14:56:12.000-04:00
Signed-off-by: Nick Hale &lt;njohnhale@gmail.com&gt;
diff --git a/pkg/controller/operators/openshift/clusteroperator_controller.go b/pkg/controller/operators/openshift/clusteroperator_controller.go
@@ -33,7 +33,7 @@ type ClusterOperatorReconciler struct {
 	*ReconcilerConfig
 
 	delayRequeue reconcile.Result
-	mutate       MutateFunc
+	mutator      Mutator
 	syncTracker  *SyncTracker
 	co           *ClusterOperator
 }
@@ -64,7 +64,7 @@ func NewClusterOperatorReconciler(opts ...ReconcilerOption) (*ClusterOperatorRec
 		MutateFunc(r.setDegraded),
 		MutateFunc(r.setUpgradeable),
 	)
-	r.mutate = mutations.Mutate
+	r.mutator = mutations
 
 	return r, nil
 }
@@ -126,6 +126,10 @@ func (r *ClusterOperatorReconciler) Reconcile(ctx context.Context, req reconcile
 	return res, utilerrors.NewAggregate(errs)
 }
 
+func (r *ClusterOperatorReconciler) mutate(ctx context.Context, co *ClusterOperator) error {
+	return r.mutator.Mutate(ctx, co)
+}
+
 func (r *ClusterOperatorReconciler) setVersions(_ context.Context, co *ClusterOperator) error {
 	// If we've successfully synced, we know our operator is working properly, so we can update the version
 	if r.syncTracker.SuccessfulSyncs() > 0 && !versionsMatch(co.Status.Versions, r.TargetVersions) {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type ClusterOperatorReconciler struct {`
`33`	`33`	`*ReconcilerConfig`
`34`	`34`
`35`	`35`	`delayRequeue reconcile.Result`
`36`		`- mutate MutateFunc`
	`36`	`+ mutator Mutator`
`37`	`37`	`syncTracker *SyncTracker`
`38`	`38`	`co *ClusterOperator`
`39`	`39`	`}`
`@@ -64,7 +64,7 @@ func NewClusterOperatorReconciler(opts ...ReconcilerOption) (*ClusterOperatorRec`
`64`	`64`	`MutateFunc(r.setDegraded),`
`65`	`65`	`MutateFunc(r.setUpgradeable),`
`66`	`66`	`)`
`67`		`- r.mutate = mutations.Mutate`
	`67`	`+ r.mutator = mutations`
`68`	`68`
`69`	`69`	`return r, nil`
`70`	`70`	`}`
`@@ -126,6 +126,10 @@ func (r *ClusterOperatorReconciler) Reconcile(ctx context.Context, req reconcile`
`126`	`126`	`return res, utilerrors.NewAggregate(errs)`
`127`	`127`	`}`
`128`	`128`
	`129`	`+func (r ClusterOperatorReconciler) mutate(ctx context.Context, co ClusterOperator) error {`
	`130`	`+ return r.mutator.Mutate(ctx, co)`
	`131`	`+}`
	`132`	`+`
`129`	`133`	`func (r ClusterOperatorReconciler) setVersions(_ context.Context, co ClusterOperator) error {`
`130`	`134`	`// If we've successfully synced, we know our operator is working properly, so we can update the version`
`131`	`135`	`if r.syncTracker.SuccessfulSyncs() > 0 && !versionsMatch(co.Status.Versions, r.TargetVersions) {`