use envoyproxy instead of ctp

Signed-off-by: Guy Daich <[email protected]>
guydc · Jan 2, 2025 · 32ae4cf · 32ae4cf
1 parent 46a40aa
commit 32ae4cf
Show file tree

Hide file tree

Showing 17 changed files with 86 additions and 363 deletions.
diff --git a/api/v1alpha1/clienttrafficpolicy_types.go b/api/v1alpha1/clienttrafficpolicy_types.go
@@ -98,13 +98,6 @@ type ClientTrafficPolicySpec struct {
 	//
 	// +optional
 	HealthCheck *HealthCheckSettings `json:"healthCheck,omitempty"`
-	// PreserveRouteOrder determines if the order of matching for HTTPRoutes is determined by Gateway-API
-	// specification (https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteRule)
-	// or preserves the order defined by users in the HTTPRoute's HTTPRouteRule list.
-	// Default: False
-	//
-	// +optional
-	PreserveRouteOrder *bool `json:"preserveRouteOrder,omitempty"`
 }
 
 // HeaderSettings provides configuration options for headers on the listener.

diff --git a/api/v1alpha1/envoyproxy_types.go b/api/v1alpha1/envoyproxy_types.go
@@ -147,6 +147,14 @@ type EnvoyProxySpec struct {
 	// +kubebuilder:validation:Enum=IPv4;IPv6;DualStack
 	// +optional
 	IPFamily *IPFamily `json:"ipFamily,omitempty"`
+
+	// PreserveRouteOrder determines if the order of matching for HTTPRoutes is determined by Gateway-API
+	// specification (https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteRule)
+	// or preserves the order defined by users in the HTTPRoute's HTTPRouteRule list.
+	// Default: False
+	//
+	// +optional
+	PreserveRouteOrder *bool `json:"preserveRouteOrder,omitempty"`
 }
 
 // RoutingType defines the type of routing of this Envoy proxy.

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_clienttrafficpolicies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_clienttrafficpolicies.yaml
@@ -489,13 +489,6 @@ spec:
                     - UnescapeAndRedirect
                     type: string
                 type: object
-              preserveRouteOrder:
-                description: |-
-                  PreserveRouteOrder determines if the order of matching for HTTPRoutes is determined by Gateway-API
-                  specification (https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteRule)
-                  or preserves the order defined by users in the HTTPRoute's HTTPRouteRule list.
-                  Default: False
-                type: boolean
               targetRef:
                 description: |-
                   TargetRef is the name of the resource this policy is being attached to.

diff --git a/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyproxies.yaml b/charts/gateway-helm/crds/generated/gateway.envoyproxy.io_envoyproxies.yaml
@@ -431,6 +431,13 @@ spec:
                   This means that the port, protocol and hostname tuple must be unique for every listener.
                   If a duplicate listener is detected, the newer listener (based on timestamp) will be rejected and its status will be updated with a "Accepted=False" condition.
                 type: boolean
+              preserveRouteOrder:
+                description: |-
+                  PreserveRouteOrder determines if the order of matching for HTTPRoutes is determined by Gateway-API
+                  specification (https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.HTTPRouteRule)
+                  or preserves the order defined by users in the HTTPRoute's HTTPRouteRule list.
+                  Default: False
+                type: boolean
               provider:
                 description: |-
                   Provider defines the desired resource provider and provider-specific configuration.

diff --git a/internal/gatewayapi/clienttrafficpolicy.go b/internal/gatewayapi/clienttrafficpolicy.go
@@ -482,10 +482,6 @@ func (t *Translator) translateClientTrafficPolicyForListener(policy *egv1a1.Clie
 			errs = errors.Join(errs, err)
 		}
 
-		if policy.Spec.PreserveRouteOrder != nil && *policy.Spec.PreserveRouteOrder {
-			httpIR.PreserverRouteOrder = true
-		}
-
 		// Early return if got any errors
 		if errs != nil {
 			return errs

diff --git a/internal/gatewayapi/helpers.go b/internal/gatewayapi/helpers.go
@@ -663,3 +663,11 @@ func getEnvoyIPFamily(envoyProxy *egv1a1.EnvoyProxy) *egv1a1.IPFamily {
 		return nil
 	}
 }
+
+// getPreserveRouteOrder returns true if route order should be preserved according to EnvoyProxy spec
+func getPreserveRouteOrder(envoyProxy *egv1a1.EnvoyProxy) bool {
+	if envoyProxy != nil && envoyProxy.Spec.PreserveRouteOrder != nil && *envoyProxy.Spec.PreserveRouteOrder {
+		return true
+	}
+	return false
+}
diff --git a/internal/gatewayapi/listener.go b/internal/gatewayapi/listener.go
@@ -134,6 +134,7 @@ func (t *Translator) ProcessListeners(gateways []*GatewayContext, xdsIR resource
 					// see more https://gateway-api.sigs.k8s.io/references/spec/#gateway.networking.k8s.io/gwapiv1.Listener.
 					irListener.Hostnames = append(irListener.Hostnames, "*")
 				}
+				irListener.PreserveRouteOrder = getPreserveRouteOrder(gateway.envoyProxy)
 				xdsIR[irKey].HTTP = append(xdsIR[irKey].HTTP, irListener)
 			case gwapiv1.TCPProtocolType, gwapiv1.TLSProtocolType:
 				irListener := &ir.TCPListener{

diff --git a/internal/gatewayapi/sort.go b/internal/gatewayapi/sort.go
@@ -85,7 +85,7 @@ func (x XdsIRRoutes) Less(i, j int) bool {
 func sortXdsIRMap(xdsIR resource.XdsIRMap) {
 	for _, irItem := range xdsIR {
 		for _, http := range irItem.HTTP {
-			if !http.PreserverRouteOrder {
+			if !http.PreserveRouteOrder {
 				// descending order
 				sort.Sort(sort.Reverse(XdsIRRoutes(http.Routes)))
 			}

diff --git a/...rafficpolicy-preserve-route-order.in.yaml → ...a/envoyproxy-preserve-route-order.in.yaml b/...rafficpolicy-preserve-route-order.in.yaml → ...a/envoyproxy-preserve-route-order.in.yaml
@@ -1,27 +1,11 @@
-clientTrafficPolicies:
-- apiVersion: gateway.envoyproxy.io/v1alpha1
-  kind: ClientTrafficPolicy
+envoyProxyForGatewayClass:
+  apiVersion: gateway.envoyproxy.io/v1alpha1
+  kind: EnvoyProxy
   metadata:
-    namespace: envoy-gateway
-    name: target-gateway-1
-  spec:
-    preserveRouteOrder: false
-    targetRef:
-      group: gateway.networking.k8s.io
-      kind: Gateway
-      name: gateway-1
-- apiVersion: gateway.envoyproxy.io/v1alpha1
-  kind: ClientTrafficPolicy
-  metadata:
-    namespace: envoy-gateway
-    name: target-gateway-1-section-http-1
+    namespace: envoy-gateway-system
+    name: test
   spec:
     preserveRouteOrder: true
-    targetRef:
-      group: gateway.networking.k8s.io
-      kind: Gateway
-      name: gateway-1
-      sectionName: http-preserve-order
 gateways:
 - apiVersion: gateway.networking.k8s.io/v1
   kind: Gateway
@@ -37,12 +21,6 @@ gateways:
       allowedRoutes:
         namespaces:
           from: All
-    - name: http-2
-      protocol: HTTP
-      port: 8080
-      allowedRoutes:
-        namespaces:
-          from: All
 httpRoutes:
 - apiVersion: gateway.networking.k8s.io/v1
   kind: HTTPRoute