set use remote address to true, and minor cleanup in httpListenerPoli…

…cy (#10626)
kgateway-dev · Feb 14, 2025 · e95c051 · e95c051
1 parent b479c18
commit e95c051
Show file tree

Hide file tree

Showing 38 changed files with 50 additions and 21 deletions.
diff --git a/internal/kgateway/extensions2/plugins/httplistenerpolicy/httplistener_plugin.go b/internal/kgateway/extensions2/plugins/httplistenerpolicy/httplistener_plugin.go
@@ -26,7 +26,7 @@ import (
 
 type httpListenerPolicy struct {
 	ct        time.Time
-	spec      v1alpha1.HTTPListenerPolicySpec
+	compress  bool
 	accessLog []*envoyaccesslog.AccessLog
 }
 
@@ -41,20 +41,11 @@ func (d *httpListenerPolicy) Equals(in any) bool {
 	}
 
 	// Check the TargetRef and Compress fields
-	if d.spec.TargetRef != d2.spec.TargetRef || d.spec.Compress != d2.spec.Compress {
+	if d.compress != d2.compress {
 		return false
 	}
 
 	// Check the AccessLog slice
-	if len(d.spec.AccessLog) != len(d2.spec.AccessLog) {
-		return false
-	}
-	for i := range d.spec.AccessLog {
-		if d.spec.AccessLog[i] != d2.spec.AccessLog[i] {
-			return false
-		}
-	}
-
 	if !slices.EqualFunc(d.accessLog, d2.accessLog, func(log *envoyaccesslog.AccessLog, log2 *envoyaccesslog.AccessLog) bool {
 		return proto.Equal(log, log2)
 	}) {
@@ -101,7 +92,7 @@ func NewPlugin(ctx context.Context, commoncol *common.CommonCollections) extensi
 			Policy:       i,
 			PolicyIR: &httpListenerPolicy{
 				ct:        i.CreationTimestamp.Time,
-				spec:      i.Spec,
+				compress:  i.Spec.Compress,
 				accessLog: accessLog,
 			},
 			TargetRefs: convert(i.Spec.TargetRef),
@@ -147,11 +138,7 @@ func (p *httpListenerPolicyPluginGwPass) ApplyHCM(
 	}
 
 	// translate access logging configuration
-	if policy.spec.AccessLog != nil {
-		if policy.accessLog != nil {
-			out.AccessLog = append(out.GetAccessLog(), policy.accessLog...)
-		}
-	}
+	out.AccessLog = append(out.GetAccessLog(), policy.accessLog...)
 	return nil
 }
 

diff --git a/internal/kgateway/setup/testdata/accesslog-filtercel-httplisteneropt-out.yaml b/internal/kgateway/setup/testdata/accesslog-filtercel-httplisteneropt-out.yaml
@@ -218,6 +218,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 - address:
@@ -273,6 +274,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: other
         statPrefix: http
+        useRemoteAddress: true
     name: other
   name: other
 routes:

diff --git a/internal/kgateway/setup/testdata/accesslog-filterhttp-httplisteneropt-out.yaml b/internal/kgateway/setup/testdata/accesslog-filterhttp-httplisteneropt-out.yaml
@@ -221,6 +221,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 - address:
@@ -276,6 +277,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: other
         statPrefix: http
+        useRemoteAddress: true
     name: other
   name: other
 routes:

diff --git a/internal/kgateway/setup/testdata/accesslog-httplisteneropt-out.yaml b/internal/kgateway/setup/testdata/accesslog-httplisteneropt-out.yaml
@@ -190,6 +190,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 - address:
@@ -273,6 +274,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: other
         statPrefix: http
+        useRemoteAddress: true
     name: other
   name: other
 routes:

diff --git a/internal/kgateway/setup/testdata/failover-default-diffns-out.yaml b/internal/kgateway/setup/testdata/failover-default-diffns-out.yaml
@@ -182,6 +182,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 routes:

diff --git a/internal/kgateway/setup/testdata/failover-default-out.yaml b/internal/kgateway/setup/testdata/failover-default-out.yaml
@@ -182,6 +182,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 routes:

diff --git a/internal/kgateway/setup/testdata/failover-out.yaml b/internal/kgateway/setup/testdata/failover-out.yaml
@@ -181,6 +181,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 routes:

diff --git a/internal/kgateway/setup/testdata/happypath-out.yaml b/internal/kgateway/setup/testdata/happypath-out.yaml
@@ -131,6 +131,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 routes:

diff --git a/internal/kgateway/setup/testdata/listeneropts-out.yaml b/internal/kgateway/setup/testdata/listeneropts-out.yaml
@@ -131,6 +131,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
   perConnectionBufferLimitBytes: 42000
@@ -156,6 +157,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: other
         statPrefix: http
+        useRemoteAddress: true
     name: other
   name: other
   perConnectionBufferLimitBytes: 42000

diff --git a/internal/kgateway/setup/testdata/routeoptions-out.yaml b/internal/kgateway/setup/testdata/routeoptions-out.yaml
@@ -131,6 +131,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 routes:

diff --git a/internal/kgateway/setup/testdata/upstream-out.yaml b/internal/kgateway/setup/testdata/upstream-out.yaml
@@ -127,6 +127,7 @@ listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        useRemoteAddress: true
     name: http
   name: http
 routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/backend-plugin-proxy.yaml b/internal/kgateway/translator/gateway/testutils/outputs/backend-plugin-proxy.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/basic.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/basic.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/...rnal/kgateway/translator/gateway/testutils/outputs/delegation/basic_invalid_hostname.yaml b/...rnal/kgateway/translator/gateway/testutils/outputs/delegation/basic_invalid_hostname.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/basic_parentref_match.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/basic_parentref_match.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/...al/kgateway/translator/gateway/testutils/outputs/delegation/basic_parentref_mismatch.yaml b/...al/kgateway/translator/gateway/testutils/outputs/delegation/basic_parentref_mismatch.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/bug-10379.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/bug-10379.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/bug-6621.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/bug-6621.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/child_rule_matcher.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/child_rule_matcher.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/cyclic1.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/cyclic1.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/cyclic2.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/cyclic2.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/...teway/translator/gateway/testutils/outputs/delegation/invalid_child_valid_standalone.yaml b/...teway/translator/gateway/testutils/outputs/delegation/invalid_child_valid_standalone.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/multiple_children.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/multiple_children.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/multiple_parents.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/multiple_parents.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/...al/kgateway/translator/gateway/testutils/outputs/delegation/nested_absolute_relative.yaml b/...al/kgateway/translator/gateway/testutils/outputs/delegation/nested_absolute_relative.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/recursive.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/recursive.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/delegation/relative_paths.yaml b/internal/kgateway/translator/gateway/testutils/outputs/delegation/relative_paths.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/directresponse.yaml b/internal/kgateway/translator/gateway/testutils/outputs/directresponse.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/http-routing-invalid-backend.yaml b/internal/kgateway/translator/gateway/testutils/outputs/http-routing-invalid-backend.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/http-routing-missing-backend.yaml b/internal/kgateway/translator/gateway/testutils/outputs/http-routing-missing-backend.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/http-routing-proxy.yaml b/internal/kgateway/translator/gateway/testutils/outputs/http-routing-proxy.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/http-with-header-modifier-proxy.yaml b/internal/kgateway/translator/gateway/testutils/outputs/http-with-header-modifier-proxy.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/...nal/kgateway/translator/gateway/testutils/outputs/http-with-lambda-destination-proxy.yaml b/...nal/kgateway/translator/gateway/testutils/outputs/http-with-lambda-destination-proxy.yaml
@@ -24,6 +24,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/https-routing-proxy.yaml b/internal/kgateway/translator/gateway/testutils/outputs/https-routing-proxy.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: https
         statPrefix: http
+        use_remote_address: true
     name: https
     transportSocket:
       name: envoy.transport_sockets.tls
@@ -52,6 +53,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: https-with-hostname
         statPrefix: http
+        use_remote_address: true
     name: https-with-hostname
     transportSocket:
       name: envoy.transport_sockets.tls

diff --git a/.../kgateway/translator/gateway/testutils/outputs/multiple-listeners-http-routing-proxy.yaml b/.../kgateway/translator/gateway/testutils/outputs/multiple-listeners-http-routing-proxy.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http-httpbin
         statPrefix: http
+        use_remote_address: true
     name: http-httpbin
   name: http-httpbin~http-bookinfo
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/no_route.yaml b/internal/kgateway/translator/gateway/testutils/outputs/no_route.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/gateway/testutils/outputs/route-sort.yaml b/internal/kgateway/translator/gateway/testutils/outputs/route-sort.yaml
@@ -21,6 +21,7 @@ Listeners:
             resourceApiVersion: V3
           routeConfigName: http
         statPrefix: http
+        use_remote_address: true
     name: http
   name: http
 Routes:

diff --git a/internal/kgateway/translator/irtranslator/fc.go b/internal/kgateway/translator/irtranslator/fc.go
@@ -244,10 +244,11 @@ func (h *hcmNetworkFilterTranslator) initializeHCM() *envoyhttp.HttpConnectionMa
 	}
 
 	return &envoyhttp.HttpConnectionManager{
-		CodecType:     envoyhttp.HttpConnectionManager_AUTO,
-		StatPrefix:    statPrefix,
-		NormalizePath: wrapperspb.Bool(true),
-		MergeSlashes:  true,
+		CodecType:        envoyhttp.HttpConnectionManager_AUTO,
+		StatPrefix:       statPrefix,
+		NormalizePath:    wrapperspb.Bool(true),
+		MergeSlashes:     true,
+		UseRemoteAddress: wrapperspb.Bool(true),
 		RouteSpecifier: &envoyhttp.HttpConnectionManager_Rds{
 			Rds: &envoyhttp.Rds{
 				ConfigSource: &envoy_config_core_v3.ConfigSource{