From c398f4903cdbac4b79efcc8e7c3864a51789927e Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Tue, 11 Jun 2024 22:35:23 +0000 Subject: [PATCH 1/2] Add config to disable proxy /shutdown admin endpoint Signed-off-by: Alex Leong --- charts/linkerd-control-plane/README.md | 1 + charts/linkerd-control-plane/values.yaml | 2 ++ charts/linkerd2-cni/README.md | 2 +- charts/partials/templates/_proxy.tpl | 2 ++ .../inject-filepath/expected/injected_nginx.yaml | 2 ++ .../inject-filepath/expected/injected_nginx_redis.yaml | 4 ++++ .../inject-filepath/expected/injected_redis.yaml | 2 ++ cli/cmd/testdata/inject_contour.golden.yml | 2 ++ .../inject_emojivoto_already_injected.golden.yml | 8 ++++++++ .../testdata/inject_emojivoto_deployment.golden.yml | 2 ++ .../inject_emojivoto_deployment_access_log.golden.yml | 2 ++ ...yment_automountServiceAccountToken_false.golden.yml | 2 ++ ...inject_emojivoto_deployment_capabilities.golden.yml | 2 ++ ...ct_emojivoto_deployment_config_overrides.golden.yml | 2 ++ ...ect_emojivoto_deployment_controller_name.golden.yml | 4 ++++ .../inject_emojivoto_deployment_debug.golden.yml | 2 ++ ...ect_emojivoto_deployment_empty_resources.golden.yml | 2 ++ ...t_emojivoto_deployment_hostNetwork_false.golden.yml | 2 ++ ...ject_emojivoto_deployment_native_sidecar.golden.yml | 2 ++ ...t_emojivoto_deployment_no_init_container.golden.yml | 2 ++ ...inject_emojivoto_deployment_opaque_ports.golden.yml | 2 ++ .../inject_emojivoto_deployment_overridden.golden.yml | 2 ++ .../inject_emojivoto_deployment_params.golden.yml | 2 ++ ...inject_emojivoto_deployment_proxyignores.golden.yml | 2 ++ .../inject_emojivoto_deployment_udp.golden.yml | 2 ++ cli/cmd/testdata/inject_emojivoto_list.golden.yml | 4 ++++ .../inject_emojivoto_list_empty_resources.golden.yml | 4 ++++ cli/cmd/testdata/inject_emojivoto_pod.golden.yml | 2 ++ .../testdata/inject_emojivoto_pod_ingress.golden.yml | 2 ++ .../inject_emojivoto_pod_proxyignores.golden.yml | 2 ++ .../inject_emojivoto_pod_with_requests.golden.yml | 2 ++ .../testdata/inject_emojivoto_statefulset.golden.yml | 2 ++ .../testdata/inject_gettest_deployment.good.golden.yml | 4 ++++ .../testdata/inject_tap_deployment_debug.golden.yml | 2 ++ .../install_controlplane_tracing_output.golden | 7 +++++++ cli/cmd/testdata/install_custom_domain.golden | 7 +++++++ cli/cmd/testdata/install_custom_registry.golden | 7 +++++++ cli/cmd/testdata/install_default.golden | 7 +++++++ .../install_default_override_dst_get_nets.golden | 7 +++++++ cli/cmd/testdata/install_default_token.golden | 7 +++++++ cli/cmd/testdata/install_gid_output.golden | 7 +++++++ cli/cmd/testdata/install_ha_output.golden | 7 +++++++ .../testdata/install_ha_with_overrides_output.golden | 7 +++++++ .../testdata/install_heartbeat_disabled_output.golden | 7 +++++++ .../testdata/install_helm_control_plane_output.golden | 7 +++++++ .../install_helm_control_plane_output_ha.golden | 7 +++++++ ...nstall_helm_control_plane_output_ha_with_gid.golden | 7 +++++++ cli/cmd/testdata/install_helm_output_ha_labels.golden | 7 +++++++ .../install_helm_output_ha_namespace_selector.golden | 7 +++++++ cli/cmd/testdata/install_no_init_container.golden | 7 +++++++ cli/cmd/testdata/install_output.golden | 7 +++++++ cli/cmd/testdata/install_proxy_ignores.golden | 7 +++++++ cli/cmd/testdata/install_values_file.golden | 7 +++++++ .../proxy-injector/fake/data/pod-with-debug.patch.json | 4 ++++ .../fake/data/pod-with-ns-annotations.patch.json | 4 ++++ controller/proxy-injector/fake/data/pod.patch.json | 4 ++++ pkg/charts/linkerd2/values.go | 1 + pkg/inject/inject.go | 10 ++++++++++ pkg/k8s/labels.go | 4 ++++ 59 files changed, 242 insertions(+), 1 deletion(-) diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md index 0df4f610b3672..c255052f0b92c 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 dd8641b2e9513..63f36d909f1dc 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,trust_dns=error # -- Log format (`plain` or `json`) for the proxy diff --git a/charts/linkerd2-cni/README.md b/charts/linkerd2-cni/README.md index f3d81767b2561..6639182609a18 100644 --- a/charts/linkerd2-cni/README.md +++ b/charts/linkerd2-cni/README.md @@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0` | commonLabels | object | `{}` | Labels to apply to all resources | | destCNIBinDir | string | `"/opt/cni/bin"` | Directory on the host where the CNI configuration will be placed | | destCNINetDir | string | `"/etc/cni/net.d"` | Directory on the host where the CNI plugin binaries reside | -| disableIPv6 | bool | `false` | Disables adding IPv6 rules on top of IPv4 rules | +| disableIPv6 | bool | `true` | Disables adding IPv6 rules on top of IPv4 rules | | enablePSP | bool | `false` | Add a PSP resource and bind it to the linkerd-cni ServiceAccounts. Note PSP has been deprecated since k8s v1.21 | | extraInitContainers | list | `[]` | Add additional initContainers to the daemonset | | ignoreInboundPorts | string | `""` | Default set of inbound ports to skip via iptables | diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index af0537e5c6f43..6890d782785ff 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -28,6 +28,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 | quote}} - 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 2bf37ca255629..05a973affaa76 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,trust_dns=error - 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 b4f1a64d5baa6..9ae55239fb378 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,trust_dns=error - 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,trust_dns=error - 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 509763c722f3c..0449b82384e87 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,trust_dns=error - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index 8f59b36a3976f..92a7fd713a7fe 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,trust_dns=error - 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 8aa4b4537abee..8a92e2dd6d42b 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,trust_dns=error - 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,trust_dns=error - 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,trust_dns=error - 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,trust_dns=error - 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 331e5ccb81b16..cffc3fdd44cee 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,trust_dns=error - 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 a6eb957299048..ce281c5d508f4 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,trust_dns=error - 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 3e8697083acd0..448bdbd2f3cd7 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,trust_dns=error - 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 e70fd7d86b407..22cf7d92616a8 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,trust_dns=error - 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 3dd0ce5bbcf9a..1d4373838b4b3 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,trust_dns=error - 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 63b044858b94c..9c80ce85efda2 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,trust_dns=error - 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,trust_dns=error - 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 16baf6313c8dc..63627ee456bb8 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,trust_dns=error - 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 ea01bd697b549..c8cfb81430ccc 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,trust_dns=error - 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 32bbcff250099..33a3fac838888 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,trust_dns=error - 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 16bcd1fc8b870..e3ba340a05bb5 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,trust_dns=error - 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 d5caeb3c81f20..7288df658f3db 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,trust_dns=error - 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 be33c12ea8c70..7ea0ac136679e 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,trust_dns=error - 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 838e265b37cf8..3b7ea1898a8a3 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,trust_dns=error - 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 2ca9162ada9be..663f85866b992 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,trust_dns=error - 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 42553aaa98ed0..03fd7c31cde7f 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,trust_dns=error - 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 d5f44056f211e..1d0466104fe31 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,trust_dns=error - 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 b2c3f27f7f90c..fca31a37a192e 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,trust_dns=error - 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,trust_dns=error - 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 6e65c937cf201..02e4e58d3b3e3 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,trust_dns=error - 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,trust_dns=error - 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 7ef85b52693b5..6f432f94278bc 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,trust_dns=error - 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 5d9c38fac13d6..f5554b87c844a 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,trust_dns=error - 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 9a1a3d648edd5..a8c440e028328 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,trust_dns=error - 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 e595b200e5923..665c9b865bf60 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,trust_dns=error - 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 b2a3c17bebf93..908d5777fd172 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,trust_dns=error - 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 2684fc7ff3282..bcb4162420db7 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,trust_dns=error - 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,trust_dns=error - 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 438c808ac735f..5a0218047f95f 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,trust_dns=error - 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 6c535e95ac03d..db5eef2ca4855 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: @@ -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,trust_dns=error" - 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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1784,6 +1789,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index 6829df0270558..25e137a4d90d5 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1332,6 +1335,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1782,6 +1787,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index fe59dbcc22279..b7e8e8be4a687 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1332,6 +1335,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1782,6 +1787,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index 6829df0270558..25e137a4d90d5 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1332,6 +1335,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1782,6 +1787,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 74aee3c6f3872..af137a1e5ae3f 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1332,6 +1335,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1782,6 +1787,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index 317a7d8dcdf90..bebd4a7f26c45 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1323,6 +1326,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1764,6 +1769,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index ed88388c044fa..078c9f23eaa54 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: @@ -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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1336,6 +1339,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1793,6 +1798,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 973794f50e2eb..da27f88d470ce 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: @@ -1060,6 +1061,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1449,6 +1452,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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,trust_dns=error" - 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 fd85bd1544c1d..cf2baa7dad930 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: @@ -1060,6 +1061,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1449,6 +1452,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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,trust_dns=error" - 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 c5dbbdb027910..4b4ba1db19b1a 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: @@ -914,6 +915,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1263,6 +1266,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1653,6 +1658,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 270baacd0f0be..693e0f1f5fc03 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: @@ -956,6 +957,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1307,6 +1310,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1761,6 +1766,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 e5ab05f252085..acdb820f15aef 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: @@ -1033,6 +1034,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1424,6 +1427,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1914,6 +1919,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 2048f01a6e469..a56478bdb8efb 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: @@ -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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1428,6 +1431,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1925,6 +1930,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 b74e3ac0aad2c..d757bea267564 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: @@ -1041,6 +1042,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1436,6 +1439,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1934,6 +1939,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 4a476c77604ac..a1b1aca7b2c80 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: @@ -1023,6 +1024,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1414,6 +1417,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1904,6 +1909,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 ebac62f0d8ced..cd4899c541fc2 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1325,6 +1328,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1768,6 +1773,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 551a4849a6025..df1dd75e904fe 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: @@ -933,6 +934,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" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1273,6 +1276,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1724,6 +1729,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 6472a28b88e54..4c2799969ef1e 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1332,6 +1335,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1782,6 +1787,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index f605e2178aca1..2182a9c45cbec 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: @@ -983,6 +984,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,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1332,6 +1335,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - name: LINKERD2_PROXY_LOG_FORMAT @@ -1782,6 +1787,8 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName + - name: LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED + value: "false" - name: LINKERD2_PROXY_LOG value: "warn,linkerd=info,trust_dns=error" - 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 8fa0679f51cb3..5dd5c825d6f1a 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,trust_dns=error" 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 48ff149841d75..b2ea7260c95ec 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,trust_dns=error" diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index baecfa9d1cdd4..b22c1e79ff545 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,trust_dns=error" diff --git a/pkg/charts/linkerd2/values.go b/pkg/charts/linkerd2/values.go index 58d88b578201d..28e57f9621771 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"` SAMountPath *VolumeMountPath `json:"saMountPath"` diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go index 3d7d51e772509..76c23bee4e47f 100644 --- a/pkg/inject/inject.go +++ b/pkg/inject/inject.go @@ -54,6 +54,7 @@ var ( k8s.ProxyCPULimitAnnotation, k8s.ProxyCPURequestAnnotation, k8s.ProxyImageAnnotation, + k8s.ProxyEnableShutdownEndpointAnnotation, k8s.ProxyLogFormatAnnotation, k8s.ProxyLogLevelAnnotation, k8s.ProxyMemoryLimitAnnotation, @@ -250,6 +251,15 @@ func applyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s values.Proxy.PodInboundPorts = override } + if override, ok := annotations[k8s.ProxyEnableShutdownEndpointAnnotation]; ok { + value, err := strconv.ParseBool(override) + if err == nil { + values.Proxy.EnableShutdownEndpoint = value + } else { + log.Warnf("unrecognised value used on pod annotation %s: %s", k8s.ProxyEnableShutdownEndpointAnnotation, err.Error()) + } + } + if override, ok := annotations[k8s.ProxyLogLevelAnnotation]; ok { values.Proxy.LogLevel = override } diff --git a/pkg/k8s/labels.go b/pkg/k8s/labels.go index cd26e96a5382c..586b99b668042 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" + // ProxyEnableShutdownEndpointAnnotation can be used to override the + // LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED config. + ProxyEnableShutdownEndpointAnnotation = ProxyConfigAnnotationsPrefix + "/enable-shutdown-endpoint" + // ProxyLogLevelAnnotation can be used to override the log level config. ProxyLogLevelAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-log-level" From f60e483f5eeefd65a9f2372fde210c99eecc7027 Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Fri, 14 Jun 2024 16:36:11 +0000 Subject: [PATCH 2/2] Update annotation name and value Signed-off-by: Alex Leong --- pkg/inject/inject.go | 11 +++++------ pkg/k8s/labels.go | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go index cca0889e3f25e..0168edbd7eb0d 100644 --- a/pkg/inject/inject.go +++ b/pkg/inject/inject.go @@ -54,7 +54,7 @@ var ( k8s.ProxyCPULimitAnnotation, k8s.ProxyCPURequestAnnotation, k8s.ProxyImageAnnotation, - k8s.ProxyEnableShutdownEndpointAnnotation, + k8s.ProxyAdminShutdownAnnotation, k8s.ProxyLogFormatAnnotation, k8s.ProxyLogLevelAnnotation, k8s.ProxyLogHTTPHeaders, @@ -252,12 +252,11 @@ func applyAnnotationOverrides(values *l5dcharts.Values, annotations map[string]s values.Proxy.PodInboundPorts = override } - if override, ok := annotations[k8s.ProxyEnableShutdownEndpointAnnotation]; ok { - value, err := strconv.ParseBool(override) - if err == nil { - values.Proxy.EnableShutdownEndpoint = value + if override, ok := annotations[k8s.ProxyAdminShutdownAnnotation]; ok { + if override == k8s.Enabled || override == k8s.Disabled { + values.Proxy.EnableShutdownEndpoint = override == k8s.Enabled } else { - log.Warnf("unrecognised value used on pod annotation %s: %s", k8s.ProxyEnableShutdownEndpointAnnotation, err.Error()) + log.Warnf("unrecognized value used for the %s annotation, valid values are: [%s, %s]", k8s.ProxyAdminShutdownAnnotation, k8s.Enabled, k8s.Disabled) } } diff --git a/pkg/k8s/labels.go b/pkg/k8s/labels.go index c4bc139590c37..ee25589921c03 100644 --- a/pkg/k8s/labels.go +++ b/pkg/k8s/labels.go @@ -209,9 +209,9 @@ const ( // ProxyGIDAnnotation can be used to override the GID config. ProxyGIDAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-gid" - // ProxyEnableShutdownEndpointAnnotation can be used to override the + // ProxyAdminShutdownAnnotation can be used to override the // LINKERD2_PROXY_SHUTDOWN_ENDPOINT_ENABLED config. - ProxyEnableShutdownEndpointAnnotation = ProxyConfigAnnotationsPrefix + "/enable-shutdown-endpoint" + ProxyAdminShutdownAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-admin-shutdown" // ProxyLogLevelAnnotation can be used to override the log level config. ProxyLogLevelAnnotation = ProxyConfigAnnotationsPrefix + "/proxy-log-level"