diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index f694884402f6d..47f44c1f7ad63 100644 --- a/charts/linkerd-control-plane/README.md +++ b/charts/linkerd-control-plane/README.md @@ -241,6 +241,7 @@ Kubernetes: `>=1.22.0-0` | proxy.disableInboundProtocolDetectTimeout | bool | `false` | When set to true, disables the protocol detection timeout on the inbound side of the proxy by setting it to a very high value | | proxy.disableOutboundProtocolDetectTimeout | bool | `false` | When set to true, disables the protocol detection timeout on the outbound side of the proxy by setting it to a very high value | | proxy.enableExternalProfiles | bool | `false` | Enable service profiles for non-Kubernetes services | +| proxy.enableShutdownEndpoint | bool | `false` | Enables the proxy's /shutdown admin endpoint | | proxy.gid | int | `-1` | Optional customisation of the group id under which the proxy runs (the group ID will be omitted if lower than 0) | | proxy.image.name | string | `"cr.l5d.io/linkerd/proxy"` | Docker image for the proxy | | proxy.image.pullPolicy | string | imagePullPolicy | Pull policy for the proxy container image | diff --git a/charts/linkerd-control-plane/values.yaml b/charts/linkerd-control-plane/values.yaml index 07188fe22e3d5..72214320ba977 100644 --- a/charts/linkerd-control-plane/values.yaml +++ b/charts/linkerd-control-plane/values.yaml @@ -149,6 +149,8 @@ proxy: # -- Tag for the proxy container image # @default -- linkerdVersion version: "" + # -- Enables the proxy's /shutdown admin endpoint + enableShutdownEndpoint: false # -- Log level for the proxy logLevel: warn,linkerd=info,hickory=error # -- Log format (`plain` or `json`) for the proxy diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index ea9363f49e10e..a6bfdb9a2b950 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -31,6 +31,8 @@ env: - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: {{.Values.proxy.requireTLSOnInboundPorts | quote}} {{ end -}} +- name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: {{.Values.proxy.enableShutdownEndpoint | quote}} - name: LINKERD2_PROXY_LOG value: "{{.Values.proxy.logLevel}}{{ if not (eq .Values.proxy.logHTTPHeaders "insecure") }},linkerd_proxy_http::client[{headers}]=off{{ end }}" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index 43048d681ecab..7512becedf63c 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -32,6 +32,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 24151e38a04e2..2cef3d0cb8f4b 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -32,6 +32,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -267,6 +269,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index a1621790231f5..84d60d3eba812 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -32,6 +32,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index 5e6d74f599ee3..1eadf9825e1d9 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -40,6 +40,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index f5457a0d25bf0..601c0c69cd9aa 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -280,6 +282,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -526,6 +530,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -772,6 +778,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index 4ece965721185..dc73ff638e71e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml index 69423717fb774..173f2c388cf2f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -35,6 +35,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml index 57a244c8dc816..c9fe281cef38e 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -35,6 +35,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index 492b96f78503b..abb4dcb2c43ce 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 3edb05d761593..9a0f93a647b96 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -44,6 +44,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_CORES value: "1" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 d06fcb2eca066..77de4b77ec9c5 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -280,6 +282,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index 283d71818453f..65a195beab7d3 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -35,6 +35,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 09080b512b5e6..9ee81882580a7 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 f9814cbb7c42f..6fb718c6dae6b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml index af8dd8e8b7a76..0e9b2918660e6 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -89,6 +89,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 d01ee515fca3b..8ad9d8c0e2eb7 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 @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml index 5c93fb9568358..9b4443cd207ba 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -35,6 +35,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index 9a22b219f73b1..3bfdba0edda09 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -35,6 +35,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml index bb77c23fcd6f4..10d70942527e4 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index f66265f70ef7d..0a490eee16ee9 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -36,6 +36,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index 16ace78c3edc0..9b844639035df 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -34,6 +34,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index 1ec11eb396e38..6903e9625a167 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -36,6 +36,8 @@ items: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -281,6 +283,8 @@ items: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 4b57bf5cfd5c1..54b3c65121996 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -36,6 +36,8 @@ items: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -281,6 +283,8 @@ items: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 3dcd4c88d6352..68d3b574cf30f 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -26,6 +26,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index f2b67aa2bb3bb..df73a73f9e8f3 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -27,6 +27,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index 6dbb101c26ca4..1def79ac111c2 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -28,6 +28,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT 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 34f67b1a4bdc3..4ac56802732c5 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -30,6 +30,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index a768c3ef6809c..d408c9c846627 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -35,6 +35,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index 306df44dedf97..217ff2e574a22 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -30,6 +30,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT @@ -278,6 +280,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index b3212e6b72d4c..24aa752b12204 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -51,6 +51,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index 1af9f12e498cd..056acf13f6195 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -985,6 +986,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1334,6 +1337,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1785,6 +1790,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index c96790e79c343..cd6fd027991bd 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1333,6 +1336,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1783,6 +1788,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 9a577a26040b1..3c584f041aa27 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1333,6 +1336,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1783,6 +1788,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index c96790e79c343..cd6fd027991bd 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1333,6 +1336,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1783,6 +1788,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT 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 b5aa60f1f2fff..5f7b4d938bab0 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1333,6 +1336,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1783,6 +1788,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index c3c226241038f..ed80487e11c81 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1324,6 +1327,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1765,6 +1770,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index 38398fae5a1a9..fcb299049e36d 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: 4321 image: @@ -985,6 +986,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1337,6 +1340,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1794,6 +1799,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 705f152adac7b..8b401bd92d1c3 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -693,6 +693,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -1061,6 +1062,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1450,6 +1453,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1936,6 +1941,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 104f85403c233..bf83fe91829af 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -693,6 +693,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -1061,6 +1062,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1450,6 +1453,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1936,6 +1941,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index fae26e94a4528..1fb3aa9fee4f1 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -597,6 +597,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -915,6 +916,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1264,6 +1267,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1654,6 +1659,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index daa6266f2e4b4..7d8ae0c623561 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -643,6 +643,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -957,6 +958,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1308,6 +1311,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1762,6 +1767,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index cd07e0102390e..816cd88b4341a 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -670,6 +670,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -1034,6 +1035,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1425,6 +1428,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1915,6 +1920,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden index a217d5a5b032a..c7c6ec10550a4 100755 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden @@ -670,6 +670,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: 4231 image: @@ -1035,6 +1036,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1429,6 +1432,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1926,6 +1931,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 31980bd899033..1b28b8c0b7268 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -674,6 +674,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -1042,6 +1043,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1437,6 +1440,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1935,6 +1940,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT 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 cbdf31faac384..448fdbe06fe30 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -665,6 +665,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -1024,6 +1025,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1415,6 +1418,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1905,6 +1910,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index e2b18204572aa..7c4a90d57b351 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1326,6 +1329,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1769,6 +1774,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index b6ea96abe94a3..13a2868b20c33 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -632,6 +632,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: 2102 image: @@ -934,6 +935,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1274,6 +1277,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1725,6 +1730,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 333402cd709c0..ffc464a9f34b3 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1333,6 +1336,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1783,6 +1788,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 7aaf06c2108ac..6d0f81acc59ab 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -666,6 +666,7 @@ data: disableInboundProtocolDetectTimeout: false disableOutboundProtocolDetectTimeout: false enableExternalProfiles: false + enableShutdownEndpoint: false experimentalEnv: null gid: -1 image: @@ -984,6 +985,8 @@ spec: fieldPath: spec.nodeName - name: LINKERD2_PROXY_INBOUND_PORTS_REQUIRE_TLS value: "8080" + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1333,6 +1336,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1783,6 +1788,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/controller/proxy-injector/fake/data/pod-with-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-debug.patch.json index 06cf4d225585d..ba82e0c719073 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -179,6 +179,10 @@ } } }, + { + "name": "LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED", + "value": "false" + }, { "name": "LINKERD2_PROXY_LOG", "value": "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" diff --git a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json index deceb977275dd..a814c6617d247 100644 --- a/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-ns-annotations.patch.json @@ -165,6 +165,10 @@ } } }, + { + "name": "LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED", + "value": "false" + }, { "name": "LINKERD2_PROXY_LOG", "value": "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index 067c1dee6f583..d6cead305d30a 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -155,6 +155,10 @@ } } }, + { + "name": "LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED", + "value": "false" + }, { "name": "LINKERD2_PROXY_LOG", "value": "warn,linkerd=info,hickory=error,linkerd_proxy_http::client[{headers}]=off" diff --git a/pkg/charts/linkerd2/values.go b/pkg/charts/linkerd2/values.go index 6371b388a9009..2949c418e5c44 100644 --- a/pkg/charts/linkerd2/values.go +++ b/pkg/charts/linkerd2/values.go @@ -115,6 +115,7 @@ type ( Cores int64 `json:"cores,omitempty"` EnableExternalProfiles bool `json:"enableExternalProfiles"` Image *Image `json:"image"` + EnableShutdownEndpoint bool `json:"enableShutdownEndpoint"` LogLevel string `json:"logLevel"` LogFormat string `json:"logFormat"` LogHTTPHeaders string `json:"logHTTPHeaders"` diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go index 8325a5f345142..0168edbd7eb0d 100644 --- a/pkg/inject/inject.go +++ b/pkg/inject/inject.go @@ -54,6 +54,7 @@ var ( k8s.ProxyCPULimitAnnotation, k8s.ProxyCPURequestAnnotation, k8s.ProxyImageAnnotation, + k8s.ProxyAdminShutdownAnnotation, k8s.ProxyLogFormatAnnotation, k8s.ProxyLogLevelAnnotation, k8s.ProxyLogHTTPHeaders, @@ -251,6 +252,14 @@ func applyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s values.Proxy.PodInboundPorts = override } + if override, ok := annotations[k8s.ProxyAdminShutdownAnnotation]; ok { + if override == k8s.Enabled || override == k8s.Disabled { + values.Proxy.EnableShutdownEndpoint = override == k8s.Enabled + } else { + log.Warnf("unrecognized value used for the %s annotation, valid values are: [%s, %s]", k8s.ProxyAdminShutdownAnnotation, k8s.Enabled, k8s.Disabled) + } + } + if override, ok := annotations[k8s.ProxyLogLevelAnnotation]; ok { values.Proxy.LogLevel = override } diff --git a/pkg/k8s/labels.go b/pkg/k8s/labels.go index f26d2d38dd4c7..ee25589921c03 100644 --- a/pkg/k8s/labels.go +++ b/pkg/k8s/labels.go @@ -209,6 +209,10 @@ const ( // ProxyGIDAnnotation can be used to override the GID config. ProxyGIDAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-gid" + // ProxyAdminShutdownAnnotation can be used to override the + // LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED config. + ProxyAdminShutdownAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-admin-shutdown" + // ProxyLogLevelAnnotation can be used to override the log level config. ProxyLogLevelAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-log-level"