t

cryostatio · Nov 17, 2023 · 7f7c1db · 7f7c1db
1 parent 2f75557
commit 7f7c1db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/internal/controllers/reconciler.go b/internal/controllers/reconciler.go
@@ -161,6 +161,12 @@ func (r *Reconciler) reconcile(ctx context.Context, cr *model.CryostatInstance)
 				return reconcile.Result{}, err
 			}
 
+			// Finalizer for CA Cert secrets
+			err = r.finalizeTLS(ctx, cr)
+			if err != nil {
+				return reconcile.Result{}, err
+			}
+
 			err = common.RemoveFinalizer(ctx, r.Client, cr.Object, cryostatFinalizer)
 			if err != nil {
 				return reconcile.Result{}, err
@@ -199,8 +205,8 @@ func (r *Reconciler) reconcile(ctx context.Context, cr *model.CryostatInstance)
 	// Set up TLS using cert-manager, if available
 	var tlsConfig *resources.TLSConfig
 
-	// Finalizer for CA Cert secrets
-	err = r.finalizeTLS(ctx, cr)
+	// Reconcile RBAC resources for Cryostat
+	err = r.reconcileRBAC(ctx, cr)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
@@ -237,12 +243,6 @@ func (r *Reconciler) reconcile(ctx context.Context, cr *model.CryostatInstance)
 		}
 	}
 
-	// Reconcile RBAC resources for Cryostat
-	err = r.reconcileRBAC(ctx, cr)
-	if err != nil {
-		return reconcile.Result{}, err
-	}
-
 	serviceSpecs := &resources.ServiceSpecs{
 		InsightsURL: r.InsightsProxy,
 	}

diff --git a/internal/controllers/reconciler_test.go b/internal/controllers/reconciler_test.go
@@ -1865,7 +1865,7 @@ func (c *controllerTest) commonTests() {
 				})
 
 				It("should fail to reconcile", func() {
-					t.expectAlreadyOwnedError(reconcileErr, "Secret", t.NewCACertSecret(nsInput.Namespace), otherInput)
+					t.expectAlreadyOwnedError(reconcileErr, "RoleBinding", t.NewRoleBinding(nsInput.Namespace), otherInput)
 				})
 
 				It("should emit a CryostatNameConflict event", func() {