Fix CI tests

quay · Nov 14, 2023 · 9084d5f · 9084d5f
1 parent eb41bef
commit 9084d5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/controllers/quay/features.go b/controllers/quay/features.go
@@ -192,6 +192,11 @@ func (r *QuayRegistryReconciler) checkRoutesAvailable(
 	quay *v1.QuayRegistry,
 	bundle *corev1.Secret,
 ) error {
+	routeManaged := v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentRoute)
+	tlsManaged := v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentTLS)
+	if routeManaged || tlsManaged {
+		return nil
+	}
 	// NOTE: The `route` component is unique because we allow users to set the
 	// `SERVER_HOSTNAME` field instead of controlling the entire fieldgroup. This
 	// value is then passed to the created `Route` using a Kustomize variable.

diff --git a/controllers/quay/quayregistry_controller.go b/controllers/quay/quayregistry_controller.go
@@ -497,19 +497,15 @@ func (r *QuayRegistryReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		)
 	}
 
-	routeManaged := v1.ComponentIsManaged(updatedQuay.Spec.Components, v1.ComponentRoute)
-	tlsManaged := v1.ComponentIsManaged(updatedQuay.Spec.Components, v1.ComponentTLS)
-	if routeManaged || tlsManaged {
-		if err := r.checkRoutesAvailable(ctx, quayContext, updatedQuay, cbundle); err != nil {
-			return r.reconcileWithCondition(
-				ctx,
-				&quay,
-				v1.ConditionTypeRolloutBlocked,
-				metav1.ConditionTrue,
-				v1.ConditionReasonRouteComponentDependencyError,
-				fmt.Sprintf("could not check for `Routes` API: %s", err),
-			)
-		}
+	if err := r.checkRoutesAvailable(ctx, quayContext, updatedQuay, cbundle); err != nil {
+		return r.reconcileWithCondition(
+			ctx,
+			&quay,
+			v1.ConditionTypeRolloutBlocked,
+			metav1.ConditionTrue,
+			v1.ConditionReasonRouteComponentDependencyError,
+			fmt.Sprintf("could not check for `Routes` API: %s", err),
+		)
 	}
 
 	osmanaged := v1.ComponentIsManaged(updatedQuay.Spec.Components, v1.ComponentObjectStorage)