From 26762e34c6362f85f826ffbe1cd18aa3cafcf33a Mon Sep 17 00:00:00 2001 From: "alexey.ponomarev" 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 | 6 +++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/TAG b/TAG index 88c5fb8..dc1e644 100644 --- a/TAG +++ b/TAG @@ -1 +1 @@ -1.4.0 +1.6.0 diff --git a/files/template.yaml.tpl b/files/template.yaml.tpl index 126640a..6a74101 100644 --- 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 index 69d6482..d7dacfb 100644 --- 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 index 226d299..2c502cb 100644 --- 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*