Make optional

Signed-off-by: David Alger <davidmalger@gmail.com>

api/v1alpha1/clienttrafficpolicy_types.go

@@ -91,7 +91,9 @@ type ClientTrafficPolicySpec struct {
 // ClientIPDetectionSettings provides configuration for determining the original client IP address for requests.
 type ClientIPDetectionSettings struct {
 	// XForwardedForSettings provides configuration for using X-Forwarded-For headers for determining the client IP address.
-	XForwardedFor XForwardedForSettings `json:"xForwardedFor,omitempty"`
+	//
+	// +optional
+	XForwardedFor *XForwardedForSettings `json:"xForwardedFor,omitempty"`
 }
 
 // XForwardedForSettings provides configuration for using X-Forwarded-For headers for determining the client IP address.
@@ -100,7 +102,9 @@ type XForwardedForSettings struct {
 	// headers to trust when determining the origin client's IP address.
 	// Refer to https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_conn_man/headers#x-forwarded-for
 	// for more details.
-	NumTrustedHops uint32 `json:"numTrustedHops"`
+	//
+	// +optional
+	NumTrustedHops *uint32 `json:"numTrustedHops,omitempty"`
 }
 
 // HTTP3Settings provides HTTP/3 configuration on the listener.

charts/gateway-helm/crds/generated/gateway.envoyproxy.io_clienttrafficpolicies.yaml

@@ -61,8 +61,6 @@ spec:
                           for more details.
                         format: int32
                         type: integer
-                    required:
-                    - numTrustedHops
                     type: object
                 type: object
               enableProxyProtocol:

internal/xds/translator/listener.go

@@ -24,6 +24,7 @@ import (
 	"github.com/golang/protobuf/ptypes/wrappers"
 	"google.golang.org/protobuf/types/known/anypb"
 	"google.golang.org/protobuf/types/known/wrapperspb"
+	"k8s.io/utils/ptr"
 
 	"github.com/envoyproxy/gateway/internal/ir"
 	"github.com/envoyproxy/gateway/internal/utils/protocov"
@@ -149,8 +150,8 @@ func (t *Translator) addXdsHTTPFilterChain(xdsListener *listenerv3.Listener, irL
 
 	// Client IP detection
 	var xffNumTrustedHops uint32
-	if irListener.ClientIPDetection != nil {
-		xffNumTrustedHops = irListener.ClientIPDetection.XForwardedFor.NumTrustedHops
+	if irListener.ClientIPDetection != nil && irListener.ClientIPDetection.XForwardedFor != nil {
+		xffNumTrustedHops = ptr.Deref(irListener.ClientIPDetection.XForwardedFor.NumTrustedHops, 0)
 	}
 
 	mgr := &hcmv3.HttpConnectionManager{

site/content/en/latest/api/extension_types.md

@@ -242,7 +242,7 @@ _Appears in:_
 
 | Field | Type | Required | Description |
 | ---   | ---  | ---      | ---         |
-| `xForwardedFor` | _[XForwardedForSettings](#xforwardedforsettings)_ |  true  | XForwardedForSettings provides configuration for using X-Forwarded-For headers for determining the client IP address. |
+| `xForwardedFor` | _[XForwardedForSettings](#xforwardedforsettings)_ |  false  | XForwardedForSettings provides configuration for using X-Forwarded-For headers for determining the client IP address. |
 
 
 #### ClientTrafficPolicy
@@ -2351,6 +2351,6 @@ _Appears in:_
 
 | Field | Type | Required | Description |
 | ---   | ---  | ---      | ---         |
-| `numTrustedHops` | _integer_ |  true  | NumTrustedHops controls the number of additional ingress proxy hops from the right side of XFF HTTP headers to trust when determining the origin client's IP address. Refer to https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_conn_man/headers#x-forwarded-for for more details. |
+| `numTrustedHops` | _integer_ |  false  | NumTrustedHops controls the number of additional ingress proxy hops from the right side of XFF HTTP headers to trust when determining the origin client's IP address. Refer to https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_conn_man/headers#x-forwarded-for for more details. |