Skip to content

Commit 8ef42a4

Browse files
committed
NODE-5565 [Sidecar] Add configuration parameter for Nginx extended logging
1 parent 0da3e69 commit 8ef42a4

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

TAG

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0
1+
1.6.0

files/template.yaml.tpl

+4
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ volumes:
114114
value: "{{ .Config.nginx.tarantoolUpstream.server.maxConns }}"
115115
- name: NGINX_TARANTOOL_UPSTREAM_SERVER_MAX_CONNS
116116
value: "{{ .Config.nginx.tarantoolUpstream.server.failTimeout }}"
117+
- name: SIDECAR_NGINX_LOGS_EXTENDED
118+
value: "{{ .Config.sidecar.nginx.logs.extended }}"
119+
- name: SIDECAR_NGINX_LOGS_FORMAT
120+
value: "{{ .Config.sidecar.nginx.logs.format }}"
117121
{{ if (isSet .ObjectMeta.Annotations (withAP "nginx-http-include")) -}}
118122
- name: NGINX_HTTP_INCLUDE
119123
value: "{{ index .ObjectMeta.Annotations (withAP `nginx-http-include`) }}"

helm/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ kubeVersion: ">=1.19.16-0"
2121
annotations:
2222
artifacthub.io/images: |
2323
- name: sidecar
24-
image: wallarm/sidecar:5.2.11
24+
image: wallarm/sidecar:5.2.0-rc1
2525
- name: sidecar-controller
26-
image: wallarm/sidecar-controller:1.4.0
26+
image: wallarm/sidecar-controller:1.6.0
2727
- name: node-helpers
2828
image: wallarm/node-helpers:5.2.11

helm/values.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@ config:
208208
### Default configuration for sidecar init and regular containers
209209
###
210210
sidecar:
211+
### Nginx sidecar-proxy log config
212+
nginx:
213+
logs:
214+
extended: false
215+
format: text
211216
### Image for all (init and regular) containers in sidecar schema
212217
###
213218
image:
@@ -787,7 +792,7 @@ controller:
787792
image:
788793
registry: docker.io
789794
image: wallarm/sidecar-controller
790-
tag: 1.4.0
795+
tag: 1.6.0
791796
pullPolicy: IfNotPresent
792797
# -- Admission webhook configuration
793798
# @default -- *See below for details*

test/smoke/run-smoke-suite.sh

+2
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,5 @@ EXEC_CMD="env $GITHUB_VARS $RUN_TESTS -n ${PYTEST_WORKERS} ${PYTEST_ARGS}"
134134
kubectl exec pytest ${EXEC_ARGS} -- ${EXEC_CMD} || get_logs_and_fail
135135
extra_debug_logs
136136
clean_allure_report
137+
138+
kubectl logs ${POD} -c sidecar-proxy

0 commit comments

Comments
 (0)