From f0820bdfbfac0419cd0985b509f6c99fa145fdc8 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 20 Oct 2020 15:36:10 -0700 Subject: [PATCH] inject: Use 'quote' function in proxy template (#5107) As described in #5105, it's not currently possible to set the proxy log level to `off`. The proxy injector's template does not quote the log level value, and so the `off` value is handled as `false`. Thanks, YAML. This change updates the proxy template to use helm's `quote` function throughout, replacing manually quoted values and fixing the quoting for the log level value. We also remove the default logFormat value, as the default is specified in values.yaml. --- charts/partials/templates/_proxy.tpl | 16 +++---- cli/cmd/install_test.go | 1 + cli/cmd/testdata/install_addon.golden | 44 +++++++++---------- ...install_controlplane_tracing_output.golden | 36 +++++++-------- .../testdata/install_custom_registry.golden | 36 +++++++-------- cli/cmd/testdata/install_default.golden | 36 +++++++-------- ...stall_default_override_dst_get_nets.golden | 36 +++++++-------- .../testdata/install_grafana_existing.golden | 32 +++++++------- cli/cmd/testdata/install_ha_output.golden | 36 +++++++-------- .../install_ha_with_overrides_output.golden | 36 +++++++-------- .../install_heartbeat_disabled_output.golden | 36 +++++++-------- cli/cmd/testdata/install_helm_output.golden | 36 +++++++-------- .../install_helm_output_addons.golden | 44 +++++++++---------- .../testdata/install_helm_output_ha.golden | 36 +++++++-------- .../install_helm_output_ha_labels.golden | 36 +++++++-------- ...l_helm_output_ha_namespace_selector.golden | 36 +++++++-------- .../testdata/install_no_init_container.golden | 36 +++++++-------- cli/cmd/testdata/install_output.golden | 36 +++++++-------- .../install_prometheus_overwrite.golden | 36 +++++++-------- cli/cmd/testdata/install_proxy_ignores.golden | 36 +++++++-------- .../install_restricted_dashboard.golden | 36 +++++++-------- cli/cmd/testdata/install_tracing.golden | 44 +++++++++---------- .../testdata/install_tracing_overwrite.golden | 44 +++++++++---------- test/integration/inject/inject_test.go | 2 +- test/integration/install_test.go | 2 +- 25 files changed, 403 insertions(+), 402 deletions(-) diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index d0f2b65c4..feff515ea 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -2,27 +2,27 @@ env: {{ if .Values.global.proxy.requireIdentityOnInboundPorts -}} - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_IDENTITY - value: "{{.Values.global.proxy.requireIdentityOnInboundPorts}}" + value: {{.Values.global.proxy.requireIdentityOnInboundPorts | quote}} {{ end -}} - name: LINKERD2_PROXY_LOG - value: {{.Values.global.proxy.logLevel}} + value: {{.Values.global.proxy.logLevel | quote}} - name: LINKERD2_PROXY_LOG_FORMAT - value: {{.Values.global.proxy.logFormat | default "plain"}} + value: {{.Values.global.proxy.logFormat | quote}} - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: {{ternary "localhost.:8086" (printf "linkerd-dst-headless.%s.svc.%s:8086" .Values.global.namespace .Values.global.clusterDomain) (eq .Values.global.proxy.component "linkerd-destination")}} {{ if .Values.global.proxy.destinationGetNetworks -}} - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "{{.Values.global.proxy.destinationGetNetworks}}" + value: {{.Values.global.proxy.destinationGetNetworks | quote}} - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS - value: "{{.Values.global.proxy.destinationGetNetworks}}" + value: {{.Values.global.proxy.destinationGetNetworks | quote}} {{ end -}} {{ if .Values.global.proxy.inboundConnectTimeout -}} - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT - value: "{{.Values.global.proxy.inboundConnectTimeout }}" + value: {{.Values.global.proxy.inboundConnectTimeout | quote}} {{ end -}} {{ if .Values.global.proxy.outboundConnectTimeout -}} - name: LINKERD2_PROXY_OUTBOUND_CONNECT_TIMEOUT - value: "{{.Values.global.proxy.outboundConnectTimeout }}" + value: {{.Values.global.proxy.outboundConnectTimeout | quote}} {{ end -}} - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR value: 0.0.0.0:{{.Values.global.proxy.ports.control}} @@ -51,7 +51,7 @@ env: {{ end -}} {{ if .Values.global.proxy.opaquePorts -}} - name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION - value: "{{.Values.global.proxy.opaquePorts}}" + value: {{.Values.global.proxy.opaquePorts | quote}} {{ end -}} - name: _pod_ns valueFrom: diff --git a/cli/cmd/install_test.go b/cli/cmd/install_test.go index 209f0436e..c7b7c2dde 100644 --- a/cli/cmd/install_test.go +++ b/cli/cmd/install_test.go @@ -418,6 +418,7 @@ func TestValidate(t *testing.T) { valid bool }{ {"", false}, + {"off", true}, {"info", true}, {"somemodule", true}, {"bad%name", false}, diff --git a/cli/cmd/testdata/install_addon.golden b/cli/cmd/testdata/install_addon.golden index 2714b88f1..ed9073c43 100644 --- a/cli/cmd/testdata/install_addon.golden +++ b/cli/cmd/testdata/install_addon.golden @@ -1118,9 +1118,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1355,9 +1355,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1610,9 +1610,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1894,9 +1894,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2109,9 +2109,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2366,9 +2366,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2610,9 +2610,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2924,9 +2924,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3363,9 +3363,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3668,9 +3668,9 @@ spec: name: linkerd-collector-config-val - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3893,9 +3893,9 @@ spec: name: ui - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index da31ae178..0214a7e9b 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -1113,9 +1113,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1365,9 +1365,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1635,9 +1635,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1933,9 +1933,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2162,9 +2162,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2433,9 +2433,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2692,9 +2692,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3020,9 +3020,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3473,9 +3473,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 665c40d3b..766ee402d 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -1112,9 +1112,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1349,9 +1349,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1604,9 +1604,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1887,9 +1887,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2102,9 +2102,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2359,9 +2359,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2603,9 +2603,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2917,9 +2917,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3356,9 +3356,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index c362ffd98..18f46e0ce 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -1112,9 +1112,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1349,9 +1349,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1604,9 +1604,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1887,9 +1887,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2102,9 +2102,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2359,9 +2359,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2603,9 +2603,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2917,9 +2917,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3356,9 +3356,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS 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 21c3f4832..245c2661b 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -1112,9 +1112,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1349,9 +1349,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1604,9 +1604,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1887,9 +1887,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2102,9 +2102,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2359,9 +2359,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2603,9 +2603,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2917,9 +2917,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3356,9 +3356,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_grafana_existing.golden b/cli/cmd/testdata/install_grafana_existing.golden index 9282016a6..bfde4d4f5 100644 --- a/cli/cmd/testdata/install_grafana_existing.golden +++ b/cli/cmd/testdata/install_grafana_existing.golden @@ -1109,9 +1109,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1346,9 +1346,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1601,9 +1601,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1884,9 +1884,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2099,9 +2099,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2356,9 +2356,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2600,9 +2600,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3031,9 +3031,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 8e8024d86..299e3df1a 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -1204,9 +1204,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1477,9 +1477,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1768,9 +1768,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2071,9 +2071,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2322,9 +2322,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2615,9 +2615,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2895,9 +2895,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3222,9 +3222,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3674,9 +3674,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 7d2af2389..f02c70ea3 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -1204,9 +1204,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1477,9 +1477,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1768,9 +1768,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2071,9 +2071,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2322,9 +2322,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2615,9 +2615,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2895,9 +2895,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3222,9 +3222,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3674,9 +3674,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 8d946bc19..27f68ab27 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -1068,9 +1068,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1305,9 +1305,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1560,9 +1560,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1798,9 +1798,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2013,9 +2013,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2270,9 +2270,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2514,9 +2514,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2828,9 +2828,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3267,9 +3267,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_helm_output.golden b/cli/cmd/testdata/install_helm_output.golden index 577f7bc7f..588d2b3fb 100644 --- a/cli/cmd/testdata/install_helm_output.golden +++ b/cli/cmd/testdata/install_helm_output.golden @@ -1470,9 +1470,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1698,9 +1698,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1944,9 +1944,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2220,9 +2220,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2427,9 +2427,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2676,9 +2676,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2912,9 +2912,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3219,9 +3219,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3651,9 +3651,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_helm_output_addons.golden b/cli/cmd/testdata/install_helm_output_addons.golden index 605bc39cf..1d3d17bf7 100644 --- a/cli/cmd/testdata/install_helm_output_addons.golden +++ b/cli/cmd/testdata/install_helm_output_addons.golden @@ -1651,9 +1651,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1879,9 +1879,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2125,9 +2125,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2402,9 +2402,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2609,9 +2609,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2858,9 +2858,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3094,9 +3094,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3401,9 +3401,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3833,9 +3833,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -4131,9 +4131,9 @@ spec: name: linkerd-collector-config-val - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -4345,9 +4345,9 @@ spec: name: ui - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_helm_output_ha.golden b/cli/cmd/testdata/install_helm_output_ha.golden index 13233d8d4..a5f53d888 100644 --- a/cli/cmd/testdata/install_helm_output_ha.golden +++ b/cli/cmd/testdata/install_helm_output_ha.golden @@ -1558,9 +1558,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1822,9 +1822,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2104,9 +2104,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2400,9 +2400,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2643,9 +2643,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2928,9 +2928,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3200,9 +3200,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3520,9 +3520,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3965,9 +3965,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index a26d1a6c5..01ec1ae9c 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -1582,9 +1582,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1850,9 +1850,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2136,9 +2136,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2440,9 +2440,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2687,9 +2687,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2976,9 +2976,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3252,9 +3252,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3576,9 +3576,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -4025,9 +4025,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS 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 6df22a6bc..b82f58535 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -1558,9 +1558,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1822,9 +1822,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2104,9 +2104,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2400,9 +2400,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2643,9 +2643,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2928,9 +2928,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3200,9 +3200,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3520,9 +3520,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3965,9 +3965,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 5c3dd12e6..492639686 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -1109,9 +1109,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1308,9 +1308,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1525,9 +1525,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1770,9 +1770,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1947,9 +1947,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2166,9 +2166,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2372,9 +2372,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2648,9 +2648,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3049,9 +3049,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 4453b258e..f778eec80 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -1113,9 +1113,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1352,9 +1352,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1609,9 +1609,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1894,9 +1894,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2111,9 +2111,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2370,9 +2370,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2616,9 +2616,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2932,9 +2932,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3373,9 +3373,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_prometheus_overwrite.golden b/cli/cmd/testdata/install_prometheus_overwrite.golden index eab9925dc..6a80f83ff 100644 --- a/cli/cmd/testdata/install_prometheus_overwrite.golden +++ b/cli/cmd/testdata/install_prometheus_overwrite.golden @@ -1169,9 +1169,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1406,9 +1406,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1661,9 +1661,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1944,9 +1944,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2159,9 +2159,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2416,9 +2416,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2660,9 +2660,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2974,9 +2974,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3466,9 +3466,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 1a027694f..2cf9a2225 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -1112,9 +1112,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1349,9 +1349,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1604,9 +1604,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1887,9 +1887,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2102,9 +2102,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2359,9 +2359,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2603,9 +2603,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2917,9 +2917,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3356,9 +3356,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_restricted_dashboard.golden b/cli/cmd/testdata/install_restricted_dashboard.golden index 8cd096616..ae3bafcad 100644 --- a/cli/cmd/testdata/install_restricted_dashboard.golden +++ b/cli/cmd/testdata/install_restricted_dashboard.golden @@ -1044,9 +1044,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1281,9 +1281,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1536,9 +1536,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1819,9 +1819,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2034,9 +2034,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2291,9 +2291,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2535,9 +2535,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2849,9 +2849,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3288,9 +3288,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_tracing.golden b/cli/cmd/testdata/install_tracing.golden index 2714b88f1..ed9073c43 100644 --- a/cli/cmd/testdata/install_tracing.golden +++ b/cli/cmd/testdata/install_tracing.golden @@ -1118,9 +1118,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1355,9 +1355,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1610,9 +1610,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1894,9 +1894,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2109,9 +2109,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2366,9 +2366,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2610,9 +2610,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2924,9 +2924,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3363,9 +3363,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3668,9 +3668,9 @@ spec: name: linkerd-collector-config-val - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3893,9 +3893,9 @@ spec: name: ui - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/cli/cmd/testdata/install_tracing_overwrite.golden b/cli/cmd/testdata/install_tracing_overwrite.golden index 7759272d0..f32fef0ce 100644 --- a/cli/cmd/testdata/install_tracing_overwrite.golden +++ b/cli/cmd/testdata/install_tracing_overwrite.golden @@ -1120,9 +1120,9 @@ spec: name: identity-issuer - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1357,9 +1357,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1612,9 +1612,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -1896,9 +1896,9 @@ spec: runAsUser: 2103 - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2111,9 +2111,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2368,9 +2368,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2612,9 +2612,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -2926,9 +2926,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3365,9 +3365,9 @@ spec: readOnly: true - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3670,9 +3670,9 @@ spec: name: linkerd-collector-config-val - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS @@ -3895,9 +3895,9 @@ spec: name: ui - env: - name: LINKERD2_PROXY_LOG - value: warn,linkerd=info + value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT - value: plain + value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS diff --git a/test/integration/inject/inject_test.go b/test/integration/inject/inject_test.go index ef24f4ffc..cbd72f03e 100644 --- a/test/integration/inject/inject_test.go +++ b/test/integration/inject/inject_test.go @@ -66,7 +66,7 @@ func TestInjectManualParams(t *testing.T) { CPULimit: "20m", MemoryLimit: "20Mi", UID: 1337, - LogLevel: "warn", + LogLevel: "off", EnableExternalProfiles: true, } flags, _ := injectionValidator.GetFlagsAndAnnotations() diff --git a/test/integration/install_test.go b/test/integration/install_test.go index cbc8bbf4c..d21980399 100644 --- a/test/integration/install_test.go +++ b/test/integration/install_test.go @@ -253,7 +253,7 @@ func TestInstallOrUpgradeCli(t *testing.T) { cmd = "install" args = []string{ "--controller-log-level", "debug", - "--proxy-log-level", "warn,linkerd=debug", + "--proxy-log-level", "off", "--proxy-version", TestHelper.GetVersion(), "--skip-inbound-ports", skippedInboundPorts, }