From a377dd1e779c8e12595b3f9ea67f31e64417a436 Mon Sep 17 00:00:00 2001 From: Alejandro Pedraza Date: Thu, 13 Jun 2024 17:15:59 -0500 Subject: [PATCH] Properly set log level for hickory dependency in proxy Followup to linkerd/linkerd2-proxy#2872 , where we swapped the trust-dns-resolver with the hickory-resolver dependency. This change updates the default log level setting for the proxy to account for that. --- charts/linkerd-control-plane/README.md | 2 +- charts/linkerd-control-plane/values.yaml | 2 +- .../testdata/inject-filepath/expected/injected_nginx.yaml | 2 +- .../inject-filepath/expected/injected_nginx_redis.yaml | 4 ++-- .../testdata/inject-filepath/expected/injected_redis.yaml | 2 +- cli/cmd/testdata/inject_contour.golden.yml | 2 +- .../testdata/inject_emojivoto_already_injected.golden.yml | 8 ++++---- cli/cmd/testdata/inject_emojivoto_deployment.golden.yml | 2 +- .../inject_emojivoto_deployment_access_log.golden.yml | 2 +- ...ployment_automountServiceAccountToken_false.golden.yml | 2 +- .../inject_emojivoto_deployment_capabilities.golden.yml | 2 +- ...nject_emojivoto_deployment_config_overrides.golden.yml | 2 +- ...inject_emojivoto_deployment_controller_name.golden.yml | 4 ++-- .../testdata/inject_emojivoto_deployment_debug.golden.yml | 2 +- ...inject_emojivoto_deployment_empty_resources.golden.yml | 2 +- ...ject_emojivoto_deployment_hostNetwork_false.golden.yml | 2 +- .../inject_emojivoto_deployment_native_sidecar.golden.yml | 2 +- ...ject_emojivoto_deployment_no_init_container.golden.yml | 2 +- .../inject_emojivoto_deployment_opaque_ports.golden.yml | 2 +- .../inject_emojivoto_deployment_overridden.golden.yml | 2 +- .../inject_emojivoto_deployment_params.golden.yml | 2 +- .../inject_emojivoto_deployment_proxyignores.golden.yml | 2 +- .../testdata/inject_emojivoto_deployment_udp.golden.yml | 2 +- cli/cmd/testdata/inject_emojivoto_list.golden.yml | 4 ++-- .../inject_emojivoto_list_empty_resources.golden.yml | 4 ++-- cli/cmd/testdata/inject_emojivoto_pod.golden.yml | 2 +- cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml | 2 +- .../testdata/inject_emojivoto_pod_proxyignores.golden.yml | 2 +- .../inject_emojivoto_pod_with_requests.golden.yml | 2 +- cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml | 2 +- .../testdata/inject_gettest_deployment.good.golden.yml | 4 ++-- cli/cmd/testdata/inject_tap_deployment_debug.golden.yml | 2 +- .../testdata/install_controlplane_tracing_output.golden | 8 ++++---- cli/cmd/testdata/install_custom_domain.golden | 8 ++++---- cli/cmd/testdata/install_custom_registry.golden | 8 ++++---- cli/cmd/testdata/install_default.golden | 8 ++++---- .../testdata/install_default_override_dst_get_nets.golden | 8 ++++---- cli/cmd/testdata/install_default_token.golden | 8 ++++---- cli/cmd/testdata/install_gid_output.golden | 8 ++++---- cli/cmd/testdata/install_ha_output.golden | 8 ++++---- cli/cmd/testdata/install_ha_with_overrides_output.golden | 8 ++++---- cli/cmd/testdata/install_heartbeat_disabled_output.golden | 8 ++++---- cli/cmd/testdata/install_helm_control_plane_output.golden | 8 ++++---- .../testdata/install_helm_control_plane_output_ha.golden | 8 ++++---- .../install_helm_control_plane_output_ha_with_gid.golden | 8 ++++---- cli/cmd/testdata/install_helm_output_ha_labels.golden | 8 ++++---- .../install_helm_output_ha_namespace_selector.golden | 8 ++++---- cli/cmd/testdata/install_no_init_container.golden | 8 ++++---- cli/cmd/testdata/install_proxy_ignores.golden | 8 ++++---- cli/cmd/testdata/install_values_file.golden | 8 ++++---- .../proxy-injector/fake/data/pod-with-debug.patch.json | 2 +- .../fake/data/pod-with-ns-annotations.patch.json | 2 +- controller/proxy-injector/fake/data/pod.patch.json | 2 +- pkg/charts/linkerd2/values_test.go | 2 +- 54 files changed, 116 insertions(+), 116 deletions(-) diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index e3279d021e75e..f694884402f6d 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -252,7 +252,7 @@ Kubernetes: `>=1.22.0-0` | 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.logLevel | string | `"warn,linkerd=info,hickory=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 | | proxy.outbound.server.http2.keepAliveInterval | string | `"10s"` | The interval at which PINGs are issued to local application HTTP/2 clients. | diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index bf7303d5792b7..07188fe22e3d5 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -150,7 +150,7 @@ proxy: # @default -- linkerdVersion version: "" # -- Log level for the proxy - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error # -- Log format (`plain` or `json`) for the proxy logFormat: plain # -- (`off` or `insecure`) If set to `off`, will prevent the proxy from diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index a856779b05ce3..43048d681ecab 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -33,7 +33,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml index b35f95457e6f9..24151e38a04e2 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -33,7 +33,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index 0ed0e53827caf..a1621790231f5 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -33,7 +33,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index 11cffb629c297..5e6d74f599ee3 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -41,7 +41,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index 2c130b2da9229..f5457a0d25bf0 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index d5c104169fea9..4ece965721185 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml index 433296a1d38a8..69423717fb774 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -36,7 +36,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml index 784daf77feb6a..57a244c8dc816 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -36,7 +36,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index c386d7fa36b13..492b96f78503b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml index a10f767b2e22f..3edb05d761593 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -45,7 +45,7 @@ spec: - name: LINKERD2_PROXY_CORES value: "1" - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml index 2a0b1bb83de0c..d06fcb2eca066 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index 96a4bb4e63d8f..283d71818453f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -36,7 +36,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml index 988b5b6be3695..09080b512b5e6 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml index 1d224c86f7ff9..f9814cbb7c42f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml index b6ab8d7dced99..af8dd8e8b7a76 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -90,7 +90,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml index 861327887526f..d01ee515fca3b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_no_init_container.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml index 487718737e19c..5c93fb9568358 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -36,7 +36,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index c5f2caf75c1f2..9a22b219f73b1 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -36,7 +36,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml index e3fdfbae192ec..bb77c23fcd6f4 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index d585047342128..f66265f70ef7d 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -37,7 +37,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index 039ad29dea8ca..16ace78c3edc0 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -35,7 +35,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index 0bb81b9a1f4d3..1ec11eb396e38 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -37,7 +37,7 @@ items: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml index 27ef79f694078..4b57bf5cfd5c1 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -37,7 +37,7 @@ items: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 476ef6b4333c9..3dcd4c88d6352 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -27,7 +27,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index fbd773527c42c..f2b67aa2bb3bb 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -28,7 +28,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index 870db6bbce9bf..6dbb101c26ca4 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -29,7 +29,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml index fc77ad9b2b965..34f67b1a4bdc3 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -31,7 +31,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index 99226518fc2ac..a768c3ef6809c 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -36,7 +36,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index 097e622812662..306df44dedf97 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -31,7 +31,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=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,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index 1e15e95bffbde..b3212e6b72d4c 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -52,7 +52,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off + value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 5bb5caf9a5a4b..1af9f12e498cd 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -986,7 +986,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1335,7 +1335,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1786,7 +1786,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 8833fba353f1c..c96790e79c343 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1334,7 +1334,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1784,7 +1784,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 91a896a11637b..9a577a26040b1 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1334,7 +1334,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1784,7 +1784,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 8833fba353f1c..c96790e79c343 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1334,7 +1334,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1784,7 +1784,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 5900caef85315..b5aa60f1f2fff 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1334,7 +1334,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1784,7 +1784,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index bbab334c479bc..c3c226241038f 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1325,7 +1325,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1766,7 +1766,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index bce485657b1a2..38398fae5a1a9 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -986,7 +986,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1338,7 +1338,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1795,7 +1795,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index f28d0f24aa9c4..705f152adac7b 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -713,7 +713,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -1062,7 +1062,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1451,7 +1451,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1937,7 +1937,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 5cb8e493ce34a..104f85403c233 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -713,7 +713,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -1062,7 +1062,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1451,7 +1451,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1937,7 +1937,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 0ed56a2029e90..fae26e94a4528 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -617,7 +617,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -916,7 +916,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1265,7 +1265,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1655,7 +1655,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index f5a2ff4dba546..daa6266f2e4b4 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -663,7 +663,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -958,7 +958,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1309,7 +1309,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1763,7 +1763,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index 307e7b93cefdc..cd07e0102390e 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -690,7 +690,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -1035,7 +1035,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1426,7 +1426,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1916,7 +1916,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden index 4d768cb74ac9e..a217d5a5b032a 100755 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden @@ -690,7 +690,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -1036,7 +1036,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1430,7 +1430,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1927,7 +1927,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index ee303d764df5b..31980bd899033 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -694,7 +694,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -1043,7 +1043,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1438,7 +1438,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1936,7 +1936,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index c9fda21bebd71..cbdf31faac384 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -685,7 +685,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -1025,7 +1025,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1416,7 +1416,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1906,7 +1906,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 57378089dc21c..e2b18204572aa 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1327,7 +1327,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1770,7 +1770,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 9ff2c0b5ce0c7..333402cd709c0 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1334,7 +1334,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1784,7 +1784,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 18a57a3df69a9..7aaf06c2108ac 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -686,7 +686,7 @@ data: timeoutSeconds: 1 logFormat: plain logHTTPHeaders: "off" - logLevel: warn,linkerd=info,trust_dns=error + logLevel: warn,linkerd=info,hickory=error nativeSidecar: false opaquePorts: 25,587,3306,4444,5432,6379,9300,11211 outbound: @@ -985,7 +985,7 @@ spec: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1334,7 +1334,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR @@ -1784,7 +1784,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: LINKERD2_PROXY_LOG - value: "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR diff --git a/controller/proxy-injector/fake/data/pod-with-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-debug.patch.json index e8982dfa9d615..06cf4d225585d 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -181,7 +181,7 @@ }, { "name": "LINKERD2_PROXY_LOG", - "value": "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + "value": "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" }, { "name": "LINKERD2_PROXY_LOG_FORMAT", diff --git a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json index 9dcd607bbb480..deceb977275dd 100644 --- a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json @@ -167,7 +167,7 @@ }, { "name": "LINKERD2_PROXY_LOG", - "value": "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + "value": "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" }, { "name": "LINKERD2_PROXY_LOG_FORMAT", diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index 2019fe14b97d6..067c1dee6f583 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -157,7 +157,7 @@ }, { "name": "LINKERD2_PROXY_LOG", - "value": "warn,linkerd=info,trust_dns=error,linkerd_proxy_http::client[{headers}]=off" + "value": "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" }, { "name": "LINKERD2_PROXY_LOG_FORMAT", diff --git a/pkg/charts/linkerd2/values_test.go b/pkg/charts/linkerd2/values_test.go index 01c6889fae566..22c1893e77908 100644 --- a/pkg/charts/linkerd2/values_test.go +++ b/pkg/charts/linkerd2/values_test.go @@ -122,7 +122,7 @@ func TestNewValues(t *testing.T) { Name: "cr.l5d.io/linkerd/proxy", Version: "", }, - LogLevel: "warn,linkerd=info,trust_dns=error", + LogLevel: "warn,linkerd=info,hickory=error", LogFormat: "plain", LogHTTPHeaders: "off", Ports: &Ports{