Skip to content
This repository was archived by the owner on May 24, 2023. It is now read-only.

Commit c6ab8ed

Browse files
committed
Error should be the last type when returning multiple items
1 parent a42e3ba commit c6ab8ed

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

controllers/nginxingresscontroller_controller.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,13 @@ func (r *NginxIngressControllerReconciler) Reconcile(ctx context.Context, req ct
255255
}
256256

257257
// createIfNotExists creates a new object. If the object exists, does nothing. It returns whether the object existed before or not.
258-
func (r *NginxIngressControllerReconciler) createIfNotExists(object client.Object) (error, bool) {
258+
func (r *NginxIngressControllerReconciler) createIfNotExists(object client.Object) (bool, error) {
259259
err := r.Create(context.TODO(), object)
260260
if err != nil && errors.IsAlreadyExists(err) {
261-
return nil, true
261+
return true, nil
262262
}
263263

264-
return err, false
264+
return false, err
265265
}
266266

267267
func (r *NginxIngressControllerReconciler) finalizeNginxIngressController(log logr.Logger, instance *k8sv1alpha1.NginxIngressController) error {

controllers/prerequisites.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func (r *NginxIngressControllerReconciler) checkPrerequisites(log logr.Logger, i
1818
if err != nil {
1919
return err
2020
}
21-
err, existed := r.createIfNotExists(sa)
21+
existed, err := r.createIfNotExists(sa)
2222
if err != nil {
2323
return err
2424
}
@@ -62,7 +62,7 @@ func (r *NginxIngressControllerReconciler) checkPrerequisites(log logr.Logger, i
6262
}
6363
ic := ingressClassForNginxIngressController(instance)
6464

65-
err, existed = r.createIfNotExists(ic)
65+
existed, err = r.createIfNotExists(ic)
6666
if err != nil {
6767
return err
6868
}

0 commit comments

Comments
 (0)