fix(proxy-injector): handle proxy-log-level with quotes

linkerd · Dec 12, 2024 · 772aab5 · 772aab5
1 parent 3452c4c
commit 772aab5
Show file tree

Hide file tree

Showing 4 changed files with 448 additions and 1 deletion.
diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl
@@ -34,7 +34,7 @@ env:
 - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED
   value: {{.Values.proxy.enableShutdownEndpoint | quote}}
 - name: LINKERD2_PROXY_LOG
-  value: "{{.Values.proxy.logLevel}}{{ if not (eq .Values.proxy.logHTTPHeaders "insecure") }},[{headers}]=off,[{request}]=off{{ end }}"
+  value: {{ printf "%s%s" .Values.proxy.logLevel (.Values.proxy.logHTTPHeaders | eq "insecure" | ternary "" ",[{headers}]=off,[{request}]=off") | quote }}
 - name: LINKERD2_PROXY_LOG_FORMAT
   value: {{.Values.proxy.logFormat | quote}}
 - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

diff --git a/controller/proxy-injector/fake/data/pod-inject-enabled-log-level.yaml b/controller/proxy-injector/fake/data/pod-inject-enabled-log-level.yaml