Skip to content

Commit

Permalink
helm: fix envoy daemonset loglevel with multiple verbose debug groups
Browse files Browse the repository at this point in the history
[ upstream commit 9d0ffdf ]

Currently, the Envoy DaemonSet loglevel is not set correctly if multiple
verbose debug groups are passed as helm values. Comma is used as group
separator instead of a space. (Got confused because Go Viper flags are
separated by a comma.)

This commit fixes this by changing the separator.

Backporting conflicts:
* minor conflict as we don't check the.Values.debug.enabled condition in
  main

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
  • Loading branch information
mhofstetter authored and jibi committed Sep 7, 2023
1 parent 36e0dc6 commit 73db393
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ spec:
args:
- '-c /var/run/cilium/envoy/bootstrap-config.json'
- '--base-id 0'
{{- if and (hasKey .Values.debug "verbose") (.Values.debug.verbose) (has "envoy" ( splitList "," .Values.debug.verbose )) }}
{{- if and (hasKey .Values.debug "verbose") (.Values.debug.verbose) (has "envoy" ( splitList " " .Values.debug.verbose )) }}
- '--log-level trace'
{{- else if and (.Values.debug.enabled) (hasKey .Values.debug "verbose") (.Values.debug.verbose) (has "flow" ( splitList "," .Values.debug.verbose )) }}
{{- else if and (.Values.debug.enabled) (hasKey .Values.debug "verbose") (.Values.debug.verbose) (has "flow" ( splitList " " .Values.debug.verbose )) }}
- '--log-level debug'
{{- else }}
- '--log-level info'
Expand Down

0 comments on commit 73db393

Please sign in to comment.