Fix ci - 2

quay · Jan 19, 2024 · 2bc8da1 · 2bc8da1
1 parent 106d1de
commit 2bc8da1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,6 @@ bin
 tmp
 cover.out
 kubeconfig
-.DS_Store
+.DS_Store
+.vscode
+.idea
diff --git a/apis/quay/v1/quayregistry_types.go b/apis/quay/v1/quayregistry_types.go
@@ -362,6 +362,15 @@ func ComponentIsManaged(components []Component, name ComponentKind) bool {
 	return false
 }
 
+func ComponentIsExplicitlyDefined(components []Component, name ComponentKind) bool {
+	for _, c := range components {
+		if c.Kind == name {
+			return true
+		}
+	}
+	return false
+}
+
 // RequiredComponent returns whether the given component is required for Quay or not.
 func RequiredComponent(component ComponentKind) bool {
 	for _, c := range requiredComponents {

diff --git a/controllers/quay/features.go b/controllers/quay/features.go
@@ -208,9 +208,18 @@ func (r *QuayRegistryReconciler) checkRoutesAvailable(
 		qctx.ServerHostname = fieldGroup.ServerHostname
 	}
 
+	// for _, c := range quay.Spec.Components {
+	// 	if c.Kind == v1.ComponentRoute {
+	// 		// return c.Managed
+	// 		fmt.Println()
+	// 	}
+	// }
+
+	routeExplicitlyDefined := v1.ComponentIsExplicitlyDefined(quay.Spec.Components, v1.ComponentRoute)
+
 	// If route is unmanaged, skip routes check
 	routeManaged := v1.ComponentIsManaged(quay.Spec.Components, v1.ComponentRoute)
-	if !routeManaged {
+	if routeExplicitlyDefined && !routeManaged {
 		return nil
 	}