Skip to content

Enforce allowedRoutes namespace constraints in HTTPRoute reconciliation #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enforce allowedRoutes namespace constraints in HTTPRoute reconciliation #844

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions pkg/controllers/route_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/tools/record"
Expand Down Expand Up @@ -291,6 +292,35 @@ func (r *routeReconciler) findControlledParentRef(ctx context.Context, route cor
return gwv1.ParentReference{}, fmt.Errorf("parentRef not found for route %s", route.Name())
}

// --- helper function ---
func isNamespaceAllowed(ctx context.Context, k8sClient client.Client, routeNamespace string, allowedNamespaces *gwv1.RouteNamespaces) (bool, error) {
if allowedNamespaces == nil || allowedNamespaces.From == nil {
return false, nil
}

switch *allowedNamespaces.From {
case gwv1.NamespacesFromAll:
return true, nil
case gwv1.NamespacesFromSame:
return false, nil // caller should handle same-namespace logic
case gwv1.NamespacesFromSelector:
selector, err := metav1.LabelSelectorAsSelector(allowedNamespaces.Selector)
if err != nil {
return false, fmt.Errorf("invalid label selector: %w", err)
}

ns := &corev1.Namespace{}
err = k8sClient.Get(ctx, client.ObjectKey{Name: routeNamespace}, ns)
if err != nil {
return false, fmt.Errorf("failed to get namespace: %w", err)
}

return selector.Matches(labels.Set(ns.Labels)), nil
default:
return false, nil
}
}

func (r *routeReconciler) reconcileUpsert(ctx context.Context, req ctrl.Request, route core.Route) error {
r.log.Infow(ctx, "reconcile, adding or updating", "name", req.Name)
r.eventRecorder.Event(route.K8sObject(), corev1.EventTypeNormal,
Expand Down