NODE-5565 [Sidecar] Add configuration parameter for Nginx extended lo…

…gging

TAG

@@ -1 +1 @@
-1.3.11
+1.6.0

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`) }}"

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

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: json
 
   ### 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*

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