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

…gging
wallarm · Jan 21, 2025 · 26762e3 · 26762e3
1 parent 0da3e69
commit 26762e3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/TAG b/TAG
@@ -1 +1 @@
-1.4.0
+1.6.0
diff --git a/files/template.yaml.tpl b/files/template.yaml.tpl
@@ -114,6 +114,10 @@ volumes:
       value: "{{ .Config.nginx.tarantoolUpstream.server.maxConns }}"
     - name: NGINX_TARANTOOL_UPSTREAM_SERVER_MAX_CONNS
       value: "{{ .Config.nginx.tarantoolUpstream.server.failTimeout }}"
+    - name: NGINX_LOGS_EXTENDED
+      value: "{{ .Config.nginx.logs.extended }}"
+    - name: NGINX_LOGS_FORMAT
+      value: "{{ .Config.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
@@ -23,6 +23,6 @@ annotations:
     - name: sidecar
       image: wallarm/sidecar:5.2.11
     - name: sidecar-controller
-      image: wallarm/sidecar-controller:1.4.0
+      image: wallarm/sidecar-controller:1.6.0
     - name: node-helpers
       image: wallarm/node-helpers:5.2.11
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -176,6 +176,10 @@ config:
       - 172.16.0.0/12
       - 127.0.0.0/8
       - fd00::/8
+    ### Nginx sidecar-proxy log config
+    logs:
+      extended: false
+      format: text
     ### Nginx directive 'worker_processes' http://nginx.org/en/docs/ngx_core_module.html#worker_processes
     ### Defines the number of worker processes
     ###
@@ -787,7 +791,7 @@ controller:
   image:
     registry: docker.io
     image: wallarm/sidecar-controller
-    tag: 1.4.0
+    tag: 1.6.0
     pullPolicy: IfNotPresent
   # -- Admission webhook configuration
   # @default -- *See below for details*