Skip to content

Commit

Permalink
NODE-5565 [Sidecar] Add configuration parameter for Nginx extended lo…
Browse files Browse the repository at this point in the history
…gging
  • Loading branch information
braek-neck committed Jan 17, 2025
1 parent 0da3e69 commit ef827d9
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.0
1.6.0
4 changes: 4 additions & 0 deletions files/template.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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: 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`) }}"
Expand Down
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ 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.4.0
image: wallarm/sidecar-controller:1.6.0
- name: node-helpers
image: wallarm/node-helpers:5.2.11
7 changes: 6 additions & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,11 @@ config:
### Default configuration for sidecar init and regular containers
###
sidecar:
### Nginx config
nginx:
logs:
extended: true
format: text
### Image for all (init and regular) containers in sidecar schema
###
image:
Expand Down Expand Up @@ -787,7 +792,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*
Expand Down
2 changes: 2 additions & 0 deletions test/smoke/run-smoke-suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ef827d9

Please sign in to comment.