linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add config to disable HTTP proxy logging (#12665) 

Fixes #12620

When the Linkerd proxy log level is set to `debug` or higher, the proxy logs HTTP headers which may contain sensitive information.

While we want to avoid logging sensitive data by default, logging of HTTP headers can be a helpful debugging tool.  Therefore, we add a `proxy.logHTTPHeaders` Helm value which prevents the logging of HTTP headers when set to false.  The default value of this value is false so that headers cannot be logged unless users opt-in.

Signed-off-by: Alex Leong <alex@buoyant.io>
This commit is contained in:
Alex Leong 2024-06-11 17:46:54 -07:00 committed by GitHub
parent 64a8867a85
commit e0fe0248d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
61 changed files with 144 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charts/linkerd-control-plane/README.md
View File

@ -251,6 +251,7 @@ Kubernetes: `>=1.22.0-0`
| proxy.inboundDiscoveryCacheUnusedTimeout | string | `"90s"` | Maximum time allowed before an unused inbound discovery result is evicted from the cache |
| proxy.livenessProbe | object | `{"initialDelaySeconds":10,"timeoutSeconds":1}` | LivenessProbe timeout and delay configuration |
| proxy.logFormat | string | `"plain"` | Log format (`plain` or `json`) for the proxy |
| proxy.logHTTPHeaders | `off` or `insecure` | `"off"` | If set to `off`, will prevent the proxy from logging HTTP headers. If set to `insecure`, HTTP headers may be logged verbatim. Note that setting this to `insecure` is not alone sufficient to log HTTP headers; the proxy logLevel must also be set to debug. |
| proxy.logLevel | string | `"warn,linkerd=info,trust_dns=error"` | Log level for the proxy |
| proxy.nativeSidecar | bool | `false` | Enable KEP-753 native sidecars This is an experimental feature. It requires Kubernetes >= 1.29. If enabled, .proxy.waitBeforeExitSeconds should not be used. |
| proxy.opaquePorts | string | `"25,587,3306,4444,5432,6379,9300,11211"` | Default set of opaque ports - SMTP (25,587) server-first - MYSQL (3306) server-first - Galera (4444) server-first - PostgreSQL (5432) server-first - Redis (6379) server-first - ElasticSearch (9300) server-first - Memcached (11211) clients do not issue any preamble, which breaks detection |

5
charts/linkerd-control-plane/values.yaml
View File

@ -153,6 +153,11 @@ proxy:
logLevel: warn,linkerd=info,trust_dns=error
# -- Log format (`plain` or `json`) for the proxy
logFormat: plain
# -- (`off` or `insecure`) If set to `off`, will prevent the proxy from
# logging HTTP headers. If set to `insecure`, HTTP headers may be logged
# verbatim. Note that setting this to `insecure` is not alone sufficient to
# log HTTP headers; the proxy logLevel must also be set to debug.
logHTTPHeaders: "off"
ports:
# -- Admin port for the proxy container
admin: 4191

5
charts/partials/templates/_proxy.tpl
View File

@ -2,6 +2,9 @@
{{ if and .Values.proxy.nativeSidecar .Values.proxy.waitBeforeExitSeconds }}
{{ fail "proxy.nativeSidecar and waitBeforeExitSeconds cannot be used simultaneously" }}
{{- end }}
{{- if not (has .Values.proxy.logHTTPHeaders (list "insecure" "off")) }}
{{- fail "logHTTPHeaders must be one of: insecure | off" }}
{{- end }}
{{- $trustDomain := (.Values.identityTrustDomain | default .Values.clusterDomain) -}}
env:
- name: _pod_name
@ -29,7 +32,7 @@ env:
value: {{.Values.proxy.requireTLSOnInboundPorts | quote}}
{{ end -}}
- name: LINKERD2_PROXY_LOG
value: {{.Values.proxy.logLevel | quote}}
value: "{{.Values.proxy.logLevel}}{{ if not (eq .Values.proxy.logHTTPHeaders "insecure") }},linkerd_proxy_http::client[{headers}]=off{{ end }}"
- name: LINKERD2_PROXY_LOG_FORMAT
value: {{.Values.proxy.logFormat | quote}}
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

5
cli/cmd/install_test.go
View File

@ -88,8 +88,9 @@ func TestRender(t *testing.T) {
PullPolicy: "ImagePullPolicy",
Version: "ProxyVersion",
},
LogLevel: "warn,linkerd=info",
LogFormat: "plain",
LogLevel: "warn,linkerd=info",
LogFormat: "plain",
LogHTTPHeaders: "off",
Resources: &charts.Resources{
CPU: charts.Constraints{
Limit: "cpu-limit",

2
cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml vendored
View File

@ -33,7 +33,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

4
cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml vendored
View File

@ -33,7 +33,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -268,7 +268,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml vendored
View File

@ -33,7 +33,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_contour.golden.yml generated vendored
View File

@ -41,7 +41,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

8
cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -281,7 +281,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -527,7 +527,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -773,7 +773,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml generated vendored
View File

@ -36,7 +36,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml generated vendored
View File

@ -36,7 +36,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml generated vendored
View File

@ -45,7 +45,7 @@ spec:
- name: LINKERD2_PROXY_CORES
value: "1"
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

4
cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -281,7 +281,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml generated vendored
View File

@ -36,7 +36,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml generated vendored
View File

@ -90,7 +90,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml generated vendored
View File

@ -36,7 +36,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml generated vendored
View File

@ -36,7 +36,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml generated vendored
View File

@ -37,7 +37,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml generated vendored
View File

@ -35,7 +35,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

4
cli/cmd/testdata/inject_emojivoto_list.golden.yml generated vendored
View File

@ -37,7 +37,7 @@ items:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -282,7 +282,7 @@ items:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

4
cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml generated vendored
View File

@ -37,7 +37,7 @@ items:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -282,7 +282,7 @@ items:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_pod.golden.yml generated vendored
View File

@ -27,7 +27,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml generated vendored
View File

@ -28,7 +28,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml generated vendored
View File

@ -29,7 +29,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml generated vendored
View File

@ -31,7 +31,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml generated vendored
View File

@ -36,7 +36,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

4
cli/cmd/testdata/inject_gettest_deployment.good.golden.yml generated vendored
View File

@ -31,7 +31,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -279,7 +279,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
cli/cmd/testdata/inject_tap_deployment_debug.golden.yml generated vendored
View File

@ -52,7 +52,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: warn,linkerd=info,trust_dns=error
value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off
- name: LINKERD2_PROXY_LOG_FORMAT
value: plain
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_controlplane_tracing_output.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -985,7 +986,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1334,7 +1335,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1785,7 +1786,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_custom_domain.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1333,7 +1334,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1783,7 +1784,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_custom_registry.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1333,7 +1334,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1783,7 +1784,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_default.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1333,7 +1334,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1783,7 +1784,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_default_override_dst_get_nets.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1333,7 +1334,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1783,7 +1784,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_default_token.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1324,7 +1325,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1765,7 +1766,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_gid_output.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -985,7 +986,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1337,7 +1338,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1794,7 +1795,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_ha_output.golden generated vendored
View File

@ -712,6 +712,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -1061,7 +1062,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1450,7 +1451,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1936,7 +1937,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_ha_with_overrides_output.golden generated vendored
View File

@ -712,6 +712,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -1061,7 +1062,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1450,7 +1451,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1936,7 +1937,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_heartbeat_disabled_output.golden generated vendored
View File

@ -616,6 +616,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -915,7 +916,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1264,7 +1265,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1654,7 +1655,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_helm_control_plane_output.golden generated vendored
View File

@ -662,6 +662,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -957,7 +958,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1308,7 +1309,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1762,7 +1763,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_helm_control_plane_output_ha.golden generated vendored
View File

@ -689,6 +689,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -1034,7 +1035,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1425,7 +1426,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1915,7 +1916,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden generated vendored
View File

@ -689,6 +689,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -1035,7 +1036,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1429,7 +1430,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1926,7 +1927,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_helm_output_ha_labels.golden generated vendored
View File

@ -693,6 +693,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -1042,7 +1043,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1437,7 +1438,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1935,7 +1936,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden generated vendored
View File

@ -684,6 +684,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -1024,7 +1025,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1415,7 +1416,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1905,7 +1906,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_no_init_container.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1326,7 +1327,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1769,7 +1770,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_output.golden generated vendored
View File

@ -646,6 +646,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info
nativeSidecar: false
opaquePorts: 25,443,587,3306,5432,11211
@ -934,7 +935,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info"
value: "warn,linkerd=info,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1274,7 +1275,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info"
value: "warn,linkerd=info,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1725,7 +1726,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info"
value: "warn,linkerd=info,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_proxy_ignores.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1333,7 +1334,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1783,7 +1784,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

7
cli/cmd/testdata/install_values_file.golden generated vendored
View File

@ -685,6 +685,7 @@ data:
initialDelaySeconds: 10
timeoutSeconds: 1
logFormat: plain
logHTTPHeaders: "off"
logLevel: warn,linkerd=info,trust_dns=error
nativeSidecar: false
opaquePorts: 25,587,3306,4444,5432,6379,9300,11211
@ -984,7 +985,7 @@ spec:
- name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS
value: "8080"
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1333,7 +1334,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR
@ -1783,7 +1784,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: LINKERD2_PROXY_LOG
value: "warn,linkerd=info,trust_dns=error"
value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
- name: LINKERD2_PROXY_LOG_FORMAT
value: "plain"
- name: LINKERD2_PROXY_DESTINATION_SVC_ADDR

2
controller/proxy-injector/fake/data/pod-with-debug.patch.json generated
View File

@ -181,7 +181,7 @@
},
{
"name": "LINKERD2_PROXY_LOG",
"value": "warn,linkerd=info,trust_dns=error"
"value": "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
},
{
"name": "LINKERD2_PROXY_LOG_FORMAT",

2
controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json generated
View File

@ -167,7 +167,7 @@
},
{
"name": "LINKERD2_PROXY_LOG",
"value": "warn,linkerd=info,trust_dns=error"
"value": "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
},
{
"name": "LINKERD2_PROXY_LOG_FORMAT",

2
controller/proxy-injector/fake/data/pod.patch.json generated
View File

@ -157,7 +157,7 @@
},
{
"name": "LINKERD2_PROXY_LOG",
"value": "warn,linkerd=info,trust_dns=error"
"value": "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off"
},
{
"name": "LINKERD2_PROXY_LOG_FORMAT",

1
pkg/charts/linkerd2/values.go
View File

@ -117,6 +117,7 @@ type (
Image *Image `json:"image"`
LogLevel string `json:"logLevel"`
LogFormat string `json:"logFormat"`
LogHTTPHeaders string `json:"logHTTPHeaders"`
SAMountPath *VolumeMountPath `json:"saMountPath"`
Ports *Ports `json:"ports"`
Resources *Resources `json:"resources"`

5
pkg/charts/linkerd2/values_test.go
View File

@ -122,8 +122,9 @@ func TestNewValues(t *testing.T) {
Name: "cr.l5d.io/linkerd/proxy",
Version: "",
},
LogLevel: "warn,linkerd=info,trust_dns=error",
LogFormat: "plain",
LogLevel: "warn,linkerd=info,trust_dns=error",
LogFormat: "plain",
LogHTTPHeaders: "off",
Ports: &Ports{
Admin: 4191,
Control: 4190,

5
pkg/inject/inject.go
View File

@ -56,6 +56,7 @@ var (
k8s.ProxyImageAnnotation,
k8s.ProxyLogFormatAnnotation,
k8s.ProxyLogLevelAnnotation,
k8s.ProxyLogHTTPHeaders,
k8s.ProxyMemoryLimitAnnotation,
k8s.ProxyMemoryRequestAnnotation,
k8s.ProxyEphemeralStorageLimitAnnotation,
@ -254,6 +255,10 @@ func applyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s
values.Proxy.LogLevel = override
}
if override, ok := annotations[k8s.ProxyLogHTTPHeaders]; ok {
values.Proxy.LogHTTPHeaders = override
}
if override, ok := annotations[k8s.ProxyLogFormatAnnotation]; ok {
values.Proxy.LogFormat = override
}

3
pkg/k8s/labels.go
View File

@ -212,6 +212,9 @@ const (
// ProxyLogLevelAnnotation can be used to override the log level config.
ProxyLogLevelAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-log-level"
// ProxyLogHTTPHeaders can be used to override if the proxy is permitted to log HTTP headers.
ProxyLogHTTPHeaders = ProxyConfigAnnotationsPrefix + "/proxy-log-http-headers"
// ProxyLogFormatAnnotation can be used to override the log format config.
ProxyLogFormatAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-log-format"

3
testutil/inject_validator.go
View File

@ -253,7 +253,8 @@ func (iv *InjectValidator) validateProxyContainer(pod *v1.PodSpec) error {
}
if iv.LogLevel != "" {
if err := iv.validateEnvVar(proxyContainer, "LINKERD2_PROXY_LOG", iv.LogLevel); err != nil {
expectedLogLevel := fmt.Sprintf("%s,linkerd_proxy_http::client[{headers}]=off", iv.LogLevel)
if err := iv.validateEnvVar(proxyContainer, "LINKERD2_PROXY_LOG", expectedLogLevel); err != nil {
return err
}
}