fix: require gateway parentRefs and retry without CRDs

Author: ThomasK33

api/v1alpha1/types_shared.go

@@ -128,7 +128,9 @@ type GatewayExposeSpec struct {
 	// WildcardHost is an optional wildcard hostname.
 	WildcardHost string `json:"wildcardHost,omitempty"`
 	// ParentRefs are Gateways that the HTTPRoute attaches to.
-	ParentRefs []GatewayParentRef `json:"parentRefs,omitempty"`
+	// At least one parentRef is required when gateway exposure is configured.
+	// +kubebuilder:validation:MinItems=1
+	ParentRefs []GatewayParentRef `json:"parentRefs"`
 }
 
 // GatewayParentRef identifies a Gateway for HTTPRoute attachment.

config/crd/bases/coder.com_codercontrolplanes.yaml

@@ -1039,8 +1039,9 @@ spec:
                         description: Host is the primary hostname for the HTTPRoute.
                         type: string
                       parentRefs:
-                        description: ParentRefs are Gateways that the HTTPRoute attaches
-                          to.
+                        description: |-
+                          ParentRefs are Gateways that the HTTPRoute attaches to.
+                          At least one parentRef is required when gateway exposure is configured.
                         items:
                           description: GatewayParentRef identifies a Gateway for HTTPRoute
                             attachment.
@@ -1058,12 +1059,14 @@ spec:
                           required:
                           - name
                           type: object
+                        minItems: 1
                         type: array
                       wildcardHost:
                         description: WildcardHost is an optional wildcard hostname.
                         type: string
                     required:
                     - host
+                    - parentRefs
                     type: object
                   ingress:
                     description: Ingress configures a networking.k8s.io/v1 Ingress.

docs/reference/api/codercontrolplane.md

@@ -95,7 +95,7 @@ GatewayExposeSpec defines Gateway API (HTTPRoute) exposure configuration.
 | --- | --- | --- |
 | `host` | string | Host is the primary hostname for the HTTPRoute. |
 | `wildcardHost` | string | WildcardHost is an optional wildcard hostname. |
-| `parentRefs` | [GatewayParentRef](#gatewayparentref) array | ParentRefs are Gateways that the HTTPRoute attaches to. |
+| `parentRefs` | [GatewayParentRef](#gatewayparentref) array | ParentRefs are Gateways that the HTTPRoute attaches to. At least one parentRef is required when gateway exposure is configured. |
 
 ### GatewayParentRef
 

internal/controller/codercontrolplane_controller.go

@@ -1310,9 +1310,9 @@ func (r *CoderControlPlaneReconciler) reconcileHTTPRoute(ctx context.Context, co
 	if err != nil {
 		if meta.IsNoMatchError(err) {
 			ctrl.LoggerFrom(ctx).WithName("controller").WithName("codercontrolplane").Info(
-				"Gateway API CRDs not available, skipping HTTPRoute reconciliation",
+				"Gateway API CRDs not available, retrying HTTPRoute reconciliation",
 			)
-			return false, nil
+			return true, nil
 		}
 		return false, fmt.Errorf("reconcile control plane httproute: %w", err)
 	}

internal/controller/codercontrolplane_controller_test.go

@@ -3649,27 +3649,15 @@ func TestReconcile_HTTPRouteExposure_RequiresParentRefs(t *testing.T) {
 			},
 		},
 	}
-	if err := k8sClient.Create(ctx, cp); err != nil {
-		t.Fatalf("create control plane: %v", err)
-	}
-	t.Cleanup(func() {
-		_ = k8sClient.Delete(ctx, cp)
-	})
-
-	r := &controller.CoderControlPlaneReconciler{Client: k8sClient, Scheme: scheme}
-	namespacedName := types.NamespacedName{Name: cp.Name, Namespace: cp.Namespace}
-	_, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: namespacedName})
+	err := k8sClient.Create(ctx, cp)
 	if err == nil {
-		t.Fatal("expected reconcile to fail when gateway parentRefs are missing")
+		t.Fatal("expected create to fail when gateway parentRefs are missing")
 	}
-	if !strings.Contains(err.Error(), "gateway parentRefs must not be empty") {
-		t.Fatalf("expected missing parentRefs assertion error, got: %v", err)
+	if !apierrors.IsInvalid(err) {
+		t.Fatalf("expected invalid error for missing gateway parentRefs, got: %v", err)
 	}
-
-	httpRoute := &gatewayv1.HTTPRoute{}
-	err = k8sClient.Get(ctx, namespacedName, httpRoute)
-	if !apierrors.IsNotFound(err) {
-		t.Fatalf("expected httproute to be absent when parentRefs are missing, got: %v", err)
+	if !strings.Contains(err.Error(), "parentRefs") {
+		t.Fatalf("expected missing parentRefs validation error, got: %v", err)
 	}
 }
 
@@ -3708,8 +3696,8 @@ func TestReconcile_HTTPRouteExposure_CRDMissingIsGraceful(t *testing.T) {
 	if err != nil {
 		t.Fatalf("expected reconcile to gracefully ignore missing Gateway CRDs, got error: %v", err)
 	}
-	if result.RequeueAfter > 0 {
-		t.Fatalf("expected missing Gateway CRDs to avoid requeue, got %+v", result)
+	if result.RequeueAfter <= 0 {
+		t.Fatalf("expected missing Gateway CRDs to request periodic requeue, got %+v", result)
 	}
 	if clientWithNoMatch.HTTPRouteGetCalls() == 0 {
 		t.Fatal("expected gateway exposure reconciliation to attempt HTTPRoute get")