Merge pull request #258 from 3scale-ops/fix-client-ip-in-logs

Fix client ip in envoy logs
3scale-ops · Apr 28, 2023 · 8f2959a · 8f2959a
2 parents 0d5d982 + 91ea529
commit 8f2959a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.19.5
+VERSION ?= 0.19.6
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

diff --git a/bundle/manifests/saas-operator.clusterserviceversion.yaml b/bundle/manifests/saas-operator.clusterserviceversion.yaml
@@ -627,15 +627,15 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/3scale/saas-operator
-    createdAt: "2023-04-19T10:33:46Z"
+    createdAt: "2023-04-28T10:01:10Z"
     description: |-
       The 3scale SaaS Operator creates and maintains a SaaS-ready deployment
       of the Red Hat 3scale API Management on OpenShift.
     operators.operatorframework.io/builder: operator-sdk-v1.27.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/3scale/saas-operator
     support: Red Hat
-  name: saas-operator.v0.19.5
+  name: saas-operator.v0.19.6
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -4339,7 +4339,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.annotations['olm.targetNamespaces']
-                image: quay.io/3scale/saas-operator:v0.19.5
+                image: quay.io/3scale/saas-operator:v0.19.6
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -4853,4 +4853,4 @@ spec:
   provider:
     name: Red Hat
     url: https://www.3scale.net/
-  version: 0.19.5
+  version: 0.19.6
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/saas-operator
-  newTag: v0.19.5
+  newTag: v0.19.6
diff --git a/pkg/assets/bindata.go b/pkg/assets/bindata.go
diff --git a/pkg/resource_builders/envoyconfig/resource_test.go b/pkg/resource_builders/envoyconfig/resource_test.go
@@ -115,7 +115,7 @@ func TestNew(t *testing.T) {
                                             authority: '%REQ(:AUTHORITY)%'
                                             bytes_received: '%BYTES_RECEIVED%'
                                             bytes_sent: '%BYTES_SENT%'
-                                            client_ip: '%REQ(X-ENVOY-EXTERNAL-ADDRESS)%'
+                                            client_ip: '%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%'
                                             downstream_tls_cipher: '%DOWNSTREAM_TLS_CIPHER%'
                                             downstream_tls_version: '%DOWNSTREAM_TLS_VERSION%'
                                             duration: '%DURATION%'

diff --git a/pkg/resource_builders/envoyconfig/templates/listeners.go b/pkg/resource_builders/envoyconfig/templates/listeners.go
@@ -186,7 +186,7 @@ func AccessLogConfig_v1(name string, tls bool) []*envoy_config_accesslog_v3.Acce
 											"upstream_cluster":      structpb.NewStringValue("%UPSTREAM_CLUSTER%"),
 											"upstream_service_time": structpb.NewStringValue("%RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)%"),
 											"user_agent":            structpb.NewStringValue("%REQ(USER-AGENT)%"),
-											"client_ip":             structpb.NewStringValue("%REQ(X-ENVOY-EXTERNAL-ADDRESS)%"),
+											"client_ip":             structpb.NewStringValue("%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%"),
 										}
 										if tls {
 											m["downstream_tls_cipher"] = structpb.NewStringValue("%DOWNSTREAM_TLS_CIPHER%")

diff --git a/pkg/resource_builders/envoyconfig/templates/listeners_test.go b/pkg/resource_builders/envoyconfig/templates/listeners_test.go
@@ -63,7 +63,7 @@ func TestListenerHTTP_v1(t *testing.T) {
                               authority: '%REQ(:AUTHORITY)%'
                               bytes_received: '%BYTES_RECEIVED%'
                               bytes_sent: '%BYTES_SENT%'
-                              client_ip: '%REQ(X-ENVOY-EXTERNAL-ADDRESS)%'
+                              client_ip: '%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%'
                               downstream_tls_cipher: '%DOWNSTREAM_TLS_CIPHER%'
                               downstream_tls_version: '%DOWNSTREAM_TLS_VERSION%'
                               duration: '%DURATION%'
@@ -170,7 +170,7 @@ func TestListenerHTTP_v1(t *testing.T) {
                               authority: '%REQ(:AUTHORITY)%'
                               bytes_received: '%BYTES_RECEIVED%'
                               bytes_sent: '%BYTES_SENT%'
-                              client_ip: '%REQ(X-ENVOY-EXTERNAL-ADDRESS)%'
+                              client_ip: '%DOWNSTREAM_REMOTE_ADDRESS_WITHOUT_PORT%'
                               duration: '%DURATION%'
                               listener: test
                               method: '%REQ(:METHOD)%'

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const (
-	version string = "v0.19.5"
+	version string = "v0.19.6"
 )
 
 // Current returns the current marin3r operator version