From d0bce594eaf9cb27816c00260a89b7d6effebc41 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Tue, 20 Oct 2020 16:13:53 -0700 Subject: [PATCH] Remove defunct proxy config variables (#5109) The proxy no longer honors DESTINATION_GET variables, as profile lookups inform when endpoint resolution is performed. Also, there is no longer a router capacity limit. --- charts/partials/templates/_proxy.tpl | 8 ---- .../expected/injected_nginx.yaml | 4 -- .../expected/injected_nginx_redis.yaml | 8 ---- .../expected/injected_redis.yaml | 4 -- cli/cmd/testdata/inject_contour.golden.yml | 4 -- ...ject_emojivoto_already_injected.golden.yml | 16 ------- .../inject_emojivoto_deployment.golden.yml | 4 -- ...ojivoto_deployment_capabilities.golden.yml | 4 -- ...oto_deployment_config_overrides.golden.yml | 4 -- ...voto_deployment_controller_name.golden.yml | 8 ---- ...ject_emojivoto_deployment_debug.golden.yml | 4 -- ...voto_deployment_empty_resources.golden.yml | 4 -- ...to_deployment_hostNetwork_false.golden.yml | 4 -- ...to_deployment_no_init_container.golden.yml | 4 -- ...emojivoto_deployment_overridden.golden.yml | 4 -- ...ojivoto_deployment_proxyignores.golden.yml | 4 -- ...ject_emojivoto_deployment_trace.golden.yml | 4 -- ...inject_emojivoto_deployment_udp.golden.yml | 4 -- .../testdata/inject_emojivoto_list.golden.yml | 8 ---- ..._emojivoto_list_empty_resources.golden.yml | 8 ---- .../testdata/inject_emojivoto_pod.golden.yml | 4 -- ...ject_emojivoto_pod_proxyignores.golden.yml | 4 -- ...ect_emojivoto_pod_with_requests.golden.yml | 4 -- .../inject_emojivoto_statefulset.golden.yml | 4 -- .../inject_gettest_deployment.good.golden.yml | 8 ---- .../testdata/inject_tap_deployment.input.yml | 4 +- .../inject_tap_deployment_debug.golden.yml | 4 -- cli/cmd/testdata/install_addon.golden | 46 ------------------- cli/cmd/testdata/install_control-plane.golden | 36 --------------- ...install_controlplane_tracing_output.golden | 38 --------------- .../testdata/install_custom_registry.golden | 38 --------------- cli/cmd/testdata/install_default.golden | 38 --------------- ...stall_default_override_dst_get_nets.golden | 38 --------------- .../testdata/install_grafana_existing.golden | 34 -------------- cli/cmd/testdata/install_ha_output.golden | 38 --------------- .../install_ha_with_overrides_output.golden | 38 --------------- .../install_heartbeat_disabled_output.golden | 38 --------------- cli/cmd/testdata/install_helm_output.golden | 38 --------------- .../install_helm_output_addons.golden | 46 ------------------- .../testdata/install_helm_output_ha.golden | 38 --------------- .../install_helm_output_ha_labels.golden | 38 --------------- ...l_helm_output_ha_namespace_selector.golden | 38 --------------- .../testdata/install_no_init_container.golden | 38 --------------- cli/cmd/testdata/install_output.golden | 38 --------------- .../install_prometheus_overwrite.golden | 38 --------------- cli/cmd/testdata/install_proxy_ignores.golden | 38 --------------- .../install_restricted_dashboard.golden | 38 --------------- cli/cmd/testdata/install_tracing.golden | 46 ------------------- .../testdata/install_tracing_overwrite.golden | 46 ------------------- .../data/inject-sidecar-container-spec.yaml | 2 - .../fake/data/pod-with-debug.patch.json | 8 ---- .../proxy-injector/fake/data/pod.patch.json | 8 ---- testutil/inject_validator.go | 2 +- 53 files changed, 2 insertions(+), 1024 deletions(-) diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index feff515ea..0221c0662 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -11,8 +11,6 @@ env: - 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 | quote}} - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: {{.Values.global.proxy.destinationGetNetworks | quote}} {{ end -}} @@ -36,8 +34,6 @@ env: - name: LINKERD2_PROXY_INBOUND_GATEWAY_SUFFIXES value: {{printf "svc.%s." .Values.global.clusterDomain}} {{ end -}} -- name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: {{printf "svc.%s." .Values.global.clusterDomain}} - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES {{- $internalDomain := printf "svc.%s." .Values.global.clusterDomain }} value: {{ternary "." $internalDomain .Values.global.proxy.enableExternalProfiles}} @@ -64,10 +60,6 @@ env: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} -{{ if eq .Values.global.proxy.component "linkerd-prometheus" -}} -- name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" -{{ end -}} {{ if .Values.global.proxy.disableIdentity -}} - name: LINKERD2_PROXY_IDENTITY_DISABLED value: disabled diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index 984a95897..2cf0b0c8d 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -31,8 +31,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -47,8 +45,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 5fb2fd948..2d8faa1f7 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -31,8 +31,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -47,8 +45,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -204,8 +200,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -220,8 +214,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index a438a6838..f6b277376 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -31,8 +31,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -47,8 +45,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index ac914ca3c..bd04ecb05 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -60,8 +60,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -76,8 +74,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index 828470fe9..ef96d751a 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -42,8 +42,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -58,8 +56,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -226,8 +222,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -242,8 +236,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -410,8 +402,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -426,8 +416,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -594,8 +582,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -610,8 +596,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index bde52a270..b71ee609c 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -42,8 +42,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -58,8 +56,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index f0e60dba2..531fa51c1 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -50,8 +50,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -66,8 +64,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 9ad7b11dc..1b5ea2395 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -51,8 +51,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -67,8 +65,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 42cf75243..29a8d403d 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -42,8 +42,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -58,8 +56,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -226,8 +222,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -242,8 +236,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index ca777488b..6ff3e6cb3 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -47,8 +47,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -63,8 +61,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 0a3d36a3e..0f8c28f0d 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -42,8 +42,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -58,8 +56,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 ea1d99aa0..602e7e78f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -43,8 +43,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -59,8 +57,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 8bed41d79..46214ee86 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 @@ -42,8 +42,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -58,8 +56,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index 1e3670fe9..6dbda0edb 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -43,8 +43,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -59,8 +57,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index ec9dc9355..1db179390 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -44,8 +44,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -60,8 +58,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_trace.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_trace.golden.yml index 27234df95..4a0950ec8 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_trace.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_trace.golden.yml @@ -44,8 +44,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -60,8 +58,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index dea09d64f..a548d27b4 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -44,8 +44,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -60,8 +58,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index 30d945863..6291eb70c 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -44,8 +44,6 @@ items: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -60,8 +58,6 @@ items: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -222,8 +218,6 @@ items: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -238,8 +232,6 @@ items: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 3a6465668..e22bfc1d0 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -44,8 +44,6 @@ items: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -60,8 +58,6 @@ items: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -222,8 +218,6 @@ items: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -238,8 +232,6 @@ items: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 91ac1a268..a904669b7 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -27,8 +27,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -43,8 +41,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index 921b4330c..1a0cfb17e 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -29,8 +29,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -45,8 +43,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE 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 908461421..ca03f6226 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -31,8 +31,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -47,8 +45,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index bd49b4698..ed73efe3f 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -43,8 +43,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -59,8 +57,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index ae5a71e44..76223dc21 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -44,8 +44,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -60,8 +58,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -230,8 +226,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -246,8 +240,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_tap_deployment.input.yml b/cli/cmd/testdata/inject_tap_deployment.input.yml index 0be3155b1..7847bb86a 100644 --- a/cli/cmd/testdata/inject_tap_deployment.input.yml +++ b/cli/cmd/testdata/inject_tap_deployment.input.yml @@ -91,7 +91,7 @@ spec: value: warn,linkerd=info - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-destination.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS + - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR value: 0.0.0.0:4190 @@ -101,8 +101,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index 008ffa5b5..ba5431a1b 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -95,8 +95,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: 10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16 - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -111,8 +109,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/install_addon.golden b/cli/cmd/testdata/install_addon.golden index ed9073c43..f12cda178 100644 --- a/cli/cmd/testdata/install_addon.golden +++ b/cli/cmd/testdata/install_addon.golden @@ -1123,8 +1123,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1139,8 +1137,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1360,8 +1356,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1376,8 +1370,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1615,8 +1607,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1631,8 +1621,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1899,8 +1887,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1915,8 +1901,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2114,8 +2098,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2130,8 +2112,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2371,8 +2351,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2387,8 +2365,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2615,8 +2591,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2631,8 +2605,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2929,8 +2901,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2945,8 +2915,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3368,8 +3336,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3384,8 +3350,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3403,8 +3367,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS @@ -3673,8 +3635,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3689,8 +3649,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3898,8 +3856,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3914,8 +3870,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/install_control-plane.golden b/cli/cmd/testdata/install_control-plane.golden index a0f5a9297..c973748e4 100644 --- a/cli/cmd/testdata/install_control-plane.golden +++ b/cli/cmd/testdata/install_control-plane.golden @@ -336,8 +336,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -352,8 +350,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -573,8 +569,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -589,8 +583,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -828,8 +820,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -844,8 +834,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1111,8 +1099,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1127,8 +1113,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1326,8 +1310,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1342,8 +1324,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1583,8 +1563,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1599,8 +1577,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1827,8 +1803,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1843,8 +1817,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2153,8 +2125,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2169,8 +2139,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2551,8 +2519,6 @@ spec: value: plain - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2586,8 +2552,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 0214a7e9b..51c41b6d9 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -1118,8 +1118,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1134,8 +1132,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1370,8 +1366,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1386,8 +1380,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1640,8 +1632,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1656,8 +1646,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1938,8 +1926,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1954,8 +1940,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2167,8 +2151,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2183,8 +2165,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2438,8 +2418,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2454,8 +2432,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2697,8 +2673,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2713,8 +2687,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3025,8 +2997,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3041,8 +3011,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3478,8 +3446,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3494,8 +3460,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3515,8 +3479,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 766ee402d..7be440320 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -1117,8 +1117,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1133,8 +1131,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1354,8 +1350,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1370,8 +1364,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1609,8 +1601,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1625,8 +1615,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1892,8 +1880,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1908,8 +1894,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2107,8 +2091,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2123,8 +2105,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2364,8 +2344,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2380,8 +2358,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2608,8 +2584,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2624,8 +2598,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2922,8 +2894,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2938,8 +2908,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3361,8 +3329,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3377,8 +3343,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3396,8 +3360,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 18f46e0ce..7300be918 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -1117,8 +1117,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1133,8 +1131,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1354,8 +1350,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1370,8 +1364,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1609,8 +1601,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1625,8 +1615,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1892,8 +1880,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1908,8 +1894,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2107,8 +2091,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2123,8 +2105,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2364,8 +2344,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2380,8 +2358,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2608,8 +2584,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2624,8 +2598,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2922,8 +2894,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2938,8 +2908,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3361,8 +3329,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3377,8 +3343,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3396,8 +3360,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS 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 245c2661b..56da49cd0 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -1117,8 +1117,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1133,8 +1131,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1354,8 +1350,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1370,8 +1364,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1609,8 +1601,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1625,8 +1615,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1892,8 +1880,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1908,8 +1894,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2107,8 +2091,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2123,8 +2105,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2364,8 +2344,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2380,8 +2358,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2608,8 +2584,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2624,8 +2598,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2922,8 +2894,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2938,8 +2908,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3361,8 +3329,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.0.0.0/8" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3377,8 +3343,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3396,8 +3360,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_grafana_existing.golden b/cli/cmd/testdata/install_grafana_existing.golden index bfde4d4f5..8b0d97b19 100644 --- a/cli/cmd/testdata/install_grafana_existing.golden +++ b/cli/cmd/testdata/install_grafana_existing.golden @@ -1114,8 +1114,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1130,8 +1128,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1351,8 +1347,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1367,8 +1361,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1606,8 +1598,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1622,8 +1612,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1889,8 +1877,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1905,8 +1891,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2104,8 +2088,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2120,8 +2102,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2361,8 +2341,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2377,8 +2355,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2605,8 +2581,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2621,8 +2595,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3036,8 +3008,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3052,8 +3022,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3071,8 +3039,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 299e3df1a..cc1497858 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -1209,8 +1209,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1225,8 +1223,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1482,8 +1478,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1498,8 +1492,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1773,8 +1765,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1789,8 +1779,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2076,8 +2064,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2092,8 +2078,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2327,8 +2311,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2343,8 +2325,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2620,8 +2600,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2636,8 +2614,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2900,8 +2876,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2916,8 +2890,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3227,8 +3199,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3243,8 +3213,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3679,8 +3647,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3695,8 +3661,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3714,8 +3678,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index f02c70ea3..420a4f2ae 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -1209,8 +1209,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1225,8 +1223,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1482,8 +1478,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1498,8 +1492,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1773,8 +1765,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1789,8 +1779,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2076,8 +2064,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2092,8 +2078,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2327,8 +2311,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2343,8 +2325,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2620,8 +2600,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2636,8 +2614,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2900,8 +2876,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2916,8 +2890,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3227,8 +3199,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3243,8 +3213,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3679,8 +3647,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3695,8 +3661,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3714,8 +3678,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 27f68ab27..dd8dc4928 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -1073,8 +1073,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1089,8 +1087,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1310,8 +1306,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1326,8 +1320,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1565,8 +1557,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1581,8 +1571,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1803,8 +1791,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1819,8 +1805,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2018,8 +2002,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2034,8 +2016,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2275,8 +2255,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2291,8 +2269,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2519,8 +2495,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2535,8 +2509,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2833,8 +2805,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2849,8 +2819,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3272,8 +3240,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3288,8 +3254,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3307,8 +3271,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_helm_output.golden b/cli/cmd/testdata/install_helm_output.golden index 588d2b3fb..b2f44c51c 100644 --- a/cli/cmd/testdata/install_helm_output.golden +++ b/cli/cmd/testdata/install_helm_output.golden @@ -1475,8 +1475,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1491,8 +1489,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1703,8 +1699,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1719,8 +1713,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1949,8 +1941,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1965,8 +1955,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2225,8 +2213,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2241,8 +2227,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2432,8 +2416,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2448,8 +2430,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2681,8 +2661,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2697,8 +2675,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2917,8 +2893,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2933,8 +2907,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3224,8 +3196,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3240,8 +3210,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3656,8 +3624,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3672,8 +3638,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3691,8 +3655,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_helm_output_addons.golden b/cli/cmd/testdata/install_helm_output_addons.golden index 1d3d17bf7..0c8509e6a 100644 --- a/cli/cmd/testdata/install_helm_output_addons.golden +++ b/cli/cmd/testdata/install_helm_output_addons.golden @@ -1656,8 +1656,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1672,8 +1670,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1884,8 +1880,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1900,8 +1894,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2130,8 +2122,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2146,8 +2136,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2407,8 +2395,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2423,8 +2409,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2614,8 +2598,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2630,8 +2612,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2863,8 +2843,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2879,8 +2857,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3099,8 +3075,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3115,8 +3089,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3406,8 +3378,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3422,8 +3392,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3838,8 +3806,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3854,8 +3820,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3873,8 +3837,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS @@ -4136,8 +4098,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -4152,8 +4112,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -4350,8 +4308,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -4366,8 +4322,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/install_helm_output_ha.golden b/cli/cmd/testdata/install_helm_output_ha.golden index a5f53d888..3fc86a885 100644 --- a/cli/cmd/testdata/install_helm_output_ha.golden +++ b/cli/cmd/testdata/install_helm_output_ha.golden @@ -1563,8 +1563,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1579,8 +1577,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1827,8 +1823,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1843,8 +1837,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2109,8 +2101,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2125,8 +2115,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2405,8 +2393,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2421,8 +2407,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2648,8 +2632,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2664,8 +2646,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2933,8 +2913,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2949,8 +2927,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3205,8 +3181,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3221,8 +3195,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3525,8 +3497,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3541,8 +3511,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3970,8 +3938,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3986,8 +3952,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -4005,8 +3969,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 01ec1ae9c..822545de8 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -1587,8 +1587,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1603,8 +1601,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1855,8 +1851,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1871,8 +1865,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2141,8 +2133,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2157,8 +2147,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2445,8 +2433,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2461,8 +2447,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2692,8 +2676,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2708,8 +2690,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2981,8 +2961,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2997,8 +2975,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3257,8 +3233,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3273,8 +3247,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3581,8 +3553,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3597,8 +3567,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -4030,8 +3998,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -4046,8 +4012,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -4065,8 +4029,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS 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 b82f58535..4a930193c 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -1563,8 +1563,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1579,8 +1577,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1827,8 +1823,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1843,8 +1837,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2109,8 +2101,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2125,8 +2115,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2405,8 +2393,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2421,8 +2407,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2648,8 +2632,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2664,8 +2646,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2933,8 +2913,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2949,8 +2927,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3205,8 +3181,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3221,8 +3195,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3525,8 +3497,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3541,8 +3511,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3970,8 +3938,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3986,8 +3952,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -4005,8 +3969,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index 492639686..feb81a90d 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -1114,8 +1114,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1130,8 +1128,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1313,8 +1309,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1329,8 +1323,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1530,8 +1522,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1546,8 +1536,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1775,8 +1763,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1791,8 +1777,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1952,8 +1936,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1968,8 +1950,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2171,8 +2151,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2187,8 +2165,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2377,8 +2353,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2393,8 +2367,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2653,8 +2625,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2669,8 +2639,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3054,8 +3022,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3070,8 +3036,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3089,8 +3053,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index f778eec80..f992bb9b7 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -1118,8 +1118,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -1130,8 +1128,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1357,8 +1353,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -1369,8 +1363,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1614,8 +1606,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -1626,8 +1616,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1899,8 +1887,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -1911,8 +1897,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2116,8 +2100,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -2128,8 +2110,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2375,8 +2355,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -2387,8 +2365,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2621,8 +2597,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -2633,8 +2607,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2937,8 +2909,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -2949,8 +2919,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3378,8 +3346,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.Namespace.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "DestinationGetNetworks" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "DestinationGetNetworks" - name: LINKERD2_PROXY_CONTROL_LISTEN_ADDR @@ -3390,8 +3356,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3409,8 +3373,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_prometheus_overwrite.golden b/cli/cmd/testdata/install_prometheus_overwrite.golden index 6a80f83ff..a77279648 100644 --- a/cli/cmd/testdata/install_prometheus_overwrite.golden +++ b/cli/cmd/testdata/install_prometheus_overwrite.golden @@ -1174,8 +1174,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1190,8 +1188,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1411,8 +1407,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1427,8 +1421,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1666,8 +1658,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1682,8 +1672,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1949,8 +1937,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1965,8 +1951,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2164,8 +2148,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2180,8 +2162,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2421,8 +2401,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2437,8 +2415,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2665,8 +2641,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2681,8 +2655,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2979,8 +2951,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2995,8 +2965,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3471,8 +3439,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3487,8 +3453,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3506,8 +3470,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 2cf9a2225..039eaf67a 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -1117,8 +1117,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1133,8 +1131,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1354,8 +1350,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1370,8 +1364,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1609,8 +1601,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1625,8 +1615,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1892,8 +1880,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1908,8 +1894,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2107,8 +2091,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2123,8 +2105,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2364,8 +2344,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2380,8 +2358,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2608,8 +2584,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2624,8 +2598,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2922,8 +2894,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2938,8 +2908,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3361,8 +3329,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3377,8 +3343,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3396,8 +3360,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_restricted_dashboard.golden b/cli/cmd/testdata/install_restricted_dashboard.golden index ae3bafcad..dfccac1af 100644 --- a/cli/cmd/testdata/install_restricted_dashboard.golden +++ b/cli/cmd/testdata/install_restricted_dashboard.golden @@ -1049,8 +1049,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1065,8 +1063,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1286,8 +1282,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1302,8 +1296,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1541,8 +1533,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1557,8 +1547,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1824,8 +1812,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1840,8 +1826,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2039,8 +2023,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2055,8 +2037,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2296,8 +2276,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2312,8 +2290,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2540,8 +2516,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2556,8 +2530,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2854,8 +2826,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2870,8 +2840,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3293,8 +3261,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3309,8 +3275,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3328,8 +3292,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS diff --git a/cli/cmd/testdata/install_tracing.golden b/cli/cmd/testdata/install_tracing.golden index ed9073c43..f12cda178 100644 --- a/cli/cmd/testdata/install_tracing.golden +++ b/cli/cmd/testdata/install_tracing.golden @@ -1123,8 +1123,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1139,8 +1137,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1360,8 +1356,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1376,8 +1370,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1615,8 +1607,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1631,8 +1621,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1899,8 +1887,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1915,8 +1901,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2114,8 +2098,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2130,8 +2112,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2371,8 +2351,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2387,8 +2365,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2615,8 +2591,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2631,8 +2605,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2929,8 +2901,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2945,8 +2915,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3368,8 +3336,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3384,8 +3350,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3403,8 +3367,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS @@ -3673,8 +3635,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3689,8 +3649,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3898,8 +3856,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3914,8 +3870,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/cli/cmd/testdata/install_tracing_overwrite.golden b/cli/cmd/testdata/install_tracing_overwrite.golden index f32fef0ce..b544b52e0 100644 --- a/cli/cmd/testdata/install_tracing_overwrite.golden +++ b/cli/cmd/testdata/install_tracing_overwrite.golden @@ -1125,8 +1125,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1141,8 +1139,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1362,8 +1358,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1378,8 +1372,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1617,8 +1609,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: localhost.:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1633,8 +1623,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -1901,8 +1889,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -1917,8 +1903,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2116,8 +2100,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2132,8 +2114,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2373,8 +2353,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2389,8 +2367,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2617,8 +2593,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2633,8 +2607,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -2931,8 +2903,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -2947,8 +2917,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3370,8 +3338,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3386,8 +3352,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3405,8 +3369,6 @@ spec: - name: LINKERD2_PROXY_DESTINATION_CONTEXT value: | {"ns":"$(_pod_ns)", "nodeName":"$(_pod_nodeName)"} - - name: LINKERD2_PROXY_OUTBOUND_ROUTER_CAPACITY - value: "10000" - name: LINKERD2_PROXY_IDENTITY_DIR value: /var/run/linkerd/identity/end-entity - name: LINKERD2_PROXY_IDENTITY_TRUST_ANCHORS @@ -3675,8 +3637,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3691,8 +3651,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE @@ -3900,8 +3858,6 @@ spec: value: "plain" - name: LINKERD2_PROXY_DESTINATION_SVC_ADDR value: linkerd-dst-headless.linkerd.svc.cluster.local:8086 - - name: LINKERD2_PROXY_DESTINATION_GET_NETWORKS - value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS value: "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - name: LINKERD2_PROXY_INBOUND_CONNECT_TIMEOUT @@ -3916,8 +3872,6 @@ spec: value: 127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTEN_ADDR value: 0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: svc.cluster.local. - name: LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE diff --git a/controller/proxy-injector/fake/data/inject-sidecar-container-spec.yaml b/controller/proxy-injector/fake/data/inject-sidecar-container-spec.yaml index b869fba2c..5e0264669 100644 --- a/controller/proxy-injector/fake/data/inject-sidecar-container-spec.yaml +++ b/controller/proxy-injector/fake/data/inject-sidecar-container-spec.yaml @@ -13,8 +13,6 @@ env: value: tcp://127.0.0.1:4140 - name: LINKERD2_PROXY_INBOUND_LISTENER value: tcp://0.0.0.0:4143 - - name: LINKERD2_PROXY_DESTINATION_GET_SUFFIXES - value: svc.cluster.local. - name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES value: . - name: LINKERD2_PROXY_POD_NAMESPACE 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 707e80338..aa10cf48f 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -120,10 +120,6 @@ "name": "LINKERD2_PROXY_DESTINATION_SVC_ADDR", "value": "linkerd-dst-headless.linkerd.svc.cluster.local:8086" }, - { - "name": "LINKERD2_PROXY_DESTINATION_GET_NETWORKS", - "value": "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - }, { "name": "LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS", "value": "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" @@ -152,10 +148,6 @@ "name": "LINKERD2_PROXY_INBOUND_LISTEN_ADDR", "value": "0.0.0.0:4143" }, - { - "name": "LINKERD2_PROXY_DESTINATION_GET_SUFFIXES", - "value": "svc.cluster.local." - }, { "name": "LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES", "value": "svc.cluster.local." diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index 399a1d6e1..8a0636173 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -110,10 +110,6 @@ "name": "LINKERD2_PROXY_DESTINATION_SVC_ADDR", "value": "linkerd-dst-headless.linkerd.svc.cluster.local:8086" }, - { - "name": "LINKERD2_PROXY_DESTINATION_GET_NETWORKS", - "value": "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" - }, { "name": "LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS", "value": "10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16" @@ -142,10 +138,6 @@ "name": "LINKERD2_PROXY_INBOUND_LISTEN_ADDR", "value": "0.0.0.0:4143" }, - { - "name": "LINKERD2_PROXY_DESTINATION_GET_SUFFIXES", - "value": "svc.cluster.local." - }, { "name": "LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES", "value": "svc.cluster.local." diff --git a/testutil/inject_validator.go b/testutil/inject_validator.go index 7e7ef0ca8..d90f3d799 100644 --- a/testutil/inject_validator.go +++ b/testutil/inject_validator.go @@ -132,7 +132,7 @@ func (iv *InjectValidator) validateProxyContainer(pod *v1.PodSpec) error { } if iv.DestinationGetNetworks != "" { - if err := iv.validateEnvVar(proxyContainer, "LINKERD2_PROXY_DESTINATION_GET_NETWORKS", iv.DestinationGetNetworks); err != nil { + if err := iv.validateEnvVar(proxyContainer, "LINKERD2_PROXY_DESTINATION_PROFILE_NETWORKS", iv.DestinationGetNetworks); err != nil { return err } }