From 7531a8b7983c9e309b66a2df11fcadc0e0488522 Mon Sep 17 00:00:00 2001
From: "alexey.ponomarev" <aponomarev@wallarm.com>
Date: Wed, 15 Jan 2025 17:43:17 +0600
Subject: [PATCH] NODE-5565 [Sidecar] Add configuration parameter for Nginx
 extended logging

---
 TAG                           | 2 +-
 files/template.yaml.tpl       | 4 ++++
 helm/Chart.yaml               | 2 +-
 helm/values.yaml              | 9 +++++++--
 test/smoke/run-smoke-suite.sh | 2 ++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/TAG b/TAG
index 17e63e7..dc1e644 100644
--- a/TAG
+++ b/TAG
@@ -1 +1 @@
-1.3.11
+1.6.0
diff --git a/files/template.yaml.tpl b/files/template.yaml.tpl
index 258acc1..b1506c1 100644
--- a/files/template.yaml.tpl
+++ b/files/template.yaml.tpl
@@ -102,6 +102,10 @@ volumes:
       value: "{{ .Config.nginx.tarantoolUpstream.server.maxConns }}"
     - name: NGINX_TARANTOOL_UPSTREAM_SERVER_MAX_CONNS
       value: "{{ .Config.nginx.tarantoolUpstream.server.failTimeout }}"
+    - name: SIDECAR_NGINX_LOGS_EXTENDED
+      value: "{{ .Config.sidecar.nginx.logs.extended }}"
+    - name: SIDECAR_NGINX_LOGS_FORMAT
+      value: "{{ .Config.sidecar.nginx.logs.format }}"
     {{ if (isSet .ObjectMeta.Annotations (withAP "nginx-http-include")) -}}
     - name: NGINX_HTTP_INCLUDE
       value: "{{ index .ObjectMeta.Annotations (withAP `nginx-http-include`) }}"
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index ee0d48e..7887336 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -21,7 +21,7 @@ kubeVersion: ">=1.19.16-0"
 annotations:
   artifacthub.io/images: |
     - name: sidecar
-      image: wallarm/sidecar:5.2.11
+      image: wallarm/sidecar:5.2.0-rc1
     - name: sidecar-controller
       image: wallarm/sidecar-controller:1.3.11
     - name: node-helpers
diff --git a/helm/values.yaml b/helm/values.yaml
index 9819ed3..f515d7e 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -191,7 +191,7 @@ config:
     image:
       registry: docker.io
       image: wallarm/sidecar
-      tag: 5.2.11
+      tag: 5.2.0-rc1
       pullPolicy: IfNotPresent
     ### Shared security context for all (init and regular) containers in sidecar schema except `iptables` container.
     ### For `iptables` container it is described in `sidecar.initContainers.iptables.securityContext` value
@@ -303,6 +303,11 @@ config:
         #  limits:
         #    cpu: 100m
         #    memory: 64Mi
+    ### Nginx config
+    nginx:
+      logs:
+        extended: true
+        format: text
 
   ### Profiles which can be used by setting Pod's annotation 'sidecar.wallarm.io/profile: name-of-profile'
   ###
@@ -765,7 +770,7 @@ controller:
   image:
     registry: docker.io
     image: wallarm/sidecar-controller
-    tag: 1.3.11
+    tag: 1.6.0
     pullPolicy: IfNotPresent
   # -- Admission webhook configuration
   # @default -- *See below for details*
diff --git a/test/smoke/run-smoke-suite.sh b/test/smoke/run-smoke-suite.sh
index af694c6..df40acd 100755
--- a/test/smoke/run-smoke-suite.sh
+++ b/test/smoke/run-smoke-suite.sh
@@ -134,3 +134,5 @@ EXEC_CMD="env $GITHUB_VARS $RUN_TESTS -n ${PYTEST_WORKERS} ${PYTEST_ARGS}"
 kubectl exec pytest ${EXEC_ARGS} -- ${EXEC_CMD} || get_logs_and_fail
 extra_debug_logs
 clean_allure_report
+
+kubectl logs ${POD} -c sidecar-proxy