ratelimitpolicy v1beta3

Signed-off-by: Eguzki Astiz Lezaun <eastizle@redhat.com>

Makefile

@@ -299,7 +299,7 @@ endef
 
 .PHONY: manifests
 manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	$(CONTROLLER_GEN) crd paths="./api/v1alpha1;./api/v1beta1;./api/v1beta2" output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) crd paths="./api/v1alpha1;./api/v1beta1;./api/v1beta2;./api/v1beta3" output:crd:artifacts:config=config/crd/bases
 	$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..."
 
 .PHONY: dependencies-manifests

api/v1beta2/route_selectors.go

@@ -1,73 +1,11 @@
 package v1beta2
 
 import (
-	"github.com/elliotchance/orderedmap/v2"
-	gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1"
-
-	"github.com/kuadrant/kuadrant-operator/pkg/library/kuadrant"
-	"github.com/kuadrant/kuadrant-operator/pkg/library/utils"
+	kuadrantv1beta3 "github.com/kuadrant/kuadrant-operator/api/v1beta3"
 )
 
-// RouteSelector defines semantics for matching an HTTP request based on conditions
-// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteSpec
-type RouteSelector struct {
-	// Hostnames defines a set of hostname that should match against the HTTP Host header to select a HTTPRoute to process the request
-	// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteSpec
-	// +optional
-	Hostnames []gatewayapiv1.Hostname `json:"hostnames,omitempty"`
-
-	// Matches define conditions used for matching the rule against incoming HTTP requests.
-	// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteSpec
-	// +optional
-	// +kubebuilder:validation:MaxItems=8
-	Matches []gatewayapiv1.HTTPRouteMatch `json:"matches,omitempty"`
-}
-
-// SelectRules returns, from a HTTPRoute, all HTTPRouteRules that either specify no HTTRouteMatches or that contain at
-// least one HTTRouteMatch whose statements expressly include (partially or totally) the statements of at least one of
-// the matches of the selector. If the selector does not specify any matches, then all HTTPRouteRules are selected.
-//
-// Additionally, if the selector specifies a non-empty list of hostnames, a non-empty intersection between the literal
-// hostnames of the selector and set of hostnames specified in the HTTPRoute must exist. Otherwise, the function
-// returns nil.
-func (s *RouteSelector) SelectRules(route *gatewayapiv1.HTTPRoute) (rules []gatewayapiv1.HTTPRouteRule) {
-	rulesIndices := orderedmap.NewOrderedMap[int, gatewayapiv1.HTTPRouteRule]()
-	if len(s.Hostnames) > 0 && !utils.Intersect(s.Hostnames, route.Spec.Hostnames) {
-		return nil
-	}
-	if len(s.Matches) == 0 {
-		return route.Spec.Rules
-	}
-	for idx := range s.Matches {
-		routeSelectorMatch := s.Matches[idx]
-		for idx, rule := range route.Spec.Rules {
-			rs := kuadrant.HTTPRouteRuleSelector{HTTPRouteMatch: &routeSelectorMatch}
-			if rs.Selects(rule) {
-				rulesIndices.Set(idx, rule)
-			}
-		}
-	}
-	for el := rulesIndices.Front(); el != nil; el = el.Next() {
-		rules = append(rules, el.Value)
-	}
-	return
-}
-
-// HostnamesForConditions allows avoiding building conditions for hostnames that are excluded by the selector
-// or when the hostname is irrelevant (i.e. matches all hostnames)
-func (s *RouteSelector) HostnamesForConditions(route *gatewayapiv1.HTTPRoute) []gatewayapiv1.Hostname {
-	hostnames := route.Spec.Hostnames
-
-	if len(s.Hostnames) > 0 {
-		hostnames = utils.Intersection(s.Hostnames, hostnames)
-	}
-
-	if utils.SameElements(hostnames, route.Spec.Hostnames) {
-		return []gatewayapiv1.Hostname{"*"}
-	}
-
-	return hostnames
-}
+// +kubebuilder:object:generate=false
+type RouteSelector = kuadrantv1beta3.RouteSelector
 
 // +kubebuilder:object:generate=false
 type RouteSelectorsGetter interface {

api/v1beta2/topology.go

@@ -8,10 +8,8 @@ import (
 )
 
 var (
-	AuthPoliciesResource      = GroupVersion.WithResource("authpolicies")
-	AuthPolicyKind            = schema.GroupKind{Group: GroupVersion.Group, Kind: "AuthPolicy"}
-	RateLimitPoliciesResource = GroupVersion.WithResource("ratelimitpolicies")
-	RateLimitPolicyKind       = schema.GroupKind{Group: GroupVersion.Group, Kind: "RateLimitPolicy"}
+	AuthPoliciesResource = GroupVersion.WithResource("authpolicies")
+	AuthPolicyKind       = schema.GroupKind{Group: GroupVersion.Group, Kind: "AuthPolicy"}
 )
 
 var _ machinery.Policy = &AuthPolicy{}
@@ -38,28 +36,3 @@ func (ap *AuthPolicy) Merge(other machinery.Policy) machinery.Policy {
 func (ap *AuthPolicy) GetLocator() string {
 	return machinery.LocatorFromObject(ap)
 }
-
-var _ machinery.Policy = &RateLimitPolicy{}
-
-func (r *RateLimitPolicy) GetTargetRefs() []machinery.PolicyTargetReference {
-	return []machinery.PolicyTargetReference{
-		machinery.LocalPolicyTargetReference{
-			LocalPolicyTargetReference: r.Spec.TargetRef,
-			PolicyNamespace:            r.Namespace,
-		},
-	}
-}
-
-func (r *RateLimitPolicy) GetMergeStrategy() machinery.MergeStrategy {
-	return func(policy machinery.Policy, _ machinery.Policy) machinery.Policy {
-		return policy
-	}
-}
-
-func (r *RateLimitPolicy) Merge(other machinery.Policy) machinery.Policy {
-	return other
-}
-
-func (r *RateLimitPolicy) GetLocator() string {
-	return machinery.LocatorFromObject(r)
-}