From e45ac3f2e22d22fb439ea656b5dae8b7426634cb Mon Sep 17 00:00:00 2001 From: UsingCoding Date: Wed, 4 Sep 2024 20:39:15 +0000 Subject: [PATCH 1/2] Subject Implement providing configuration for LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT and LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT to linkerd-proxy. Default values for 30s will be enough to linux TCP-stack completes about 7 packages retransmissions, after about 7 retransmissions RTO (retransmission timeout) will rapidly grows and do not make much sense to wait for too long. Setting TCP_USER_TIMEOUT between linkerd-proxy and wild world is enough, since connections to containers in same pod is more stable and reliable Fixes #13023 Signed-off-by: UsingCoding --- charts/partials/templates/_proxy.tpl | 4 ++++ .../inject-filepath/expected/injected_nginx.yaml | 4 ++++ .../expected/injected_nginx_redis.yaml | 8 ++++++++ .../inject-filepath/expected/injected_redis.yaml | 4 ++++ cli/cmd/testdata/inject_contour.golden.yml | 4 ++++ .../inject_emojivoto_already_injected.golden.yml | 16 ++++++++++++++++ .../inject_emojivoto_deployment.golden.yml | 4 ++++ ...ct_emojivoto_deployment_access_log.golden.yml | 4 ++++ ...automountServiceAccountToken_false.golden.yml | 4 ++++ ..._emojivoto_deployment_capabilities.golden.yml | 4 ++++ ...jivoto_deployment_config_overrides.golden.yml | 4 ++++ ...ojivoto_deployment_controller_name.golden.yml | 8 ++++++++ .../inject_emojivoto_deployment_debug.golden.yml | 4 ++++ ...ojivoto_deployment_empty_resources.golden.yml | 4 ++++ ...ivoto_deployment_hostNetwork_false.golden.yml | 4 ++++ ...mojivoto_deployment_native_sidecar.golden.yml | 4 ++++ ...ivoto_deployment_no_init_container.golden.yml | 4 ++++ ..._emojivoto_deployment_opaque_ports.golden.yml | 4 ++++ ...ct_emojivoto_deployment_overridden.golden.yml | 4 ++++ ...inject_emojivoto_deployment_params.golden.yml | 4 ++++ ..._emojivoto_deployment_proxyignores.golden.yml | 4 ++++ .../inject_emojivoto_deployment_udp.golden.yml | 4 ++++ .../testdata/inject_emojivoto_list.golden.yml | 8 ++++++++ ...ect_emojivoto_list_empty_resources.golden.yml | 8 ++++++++ cli/cmd/testdata/inject_emojivoto_pod.golden.yml | 4 ++++ .../inject_emojivoto_pod_ingress.golden.yml | 4 ++++ .../inject_emojivoto_pod_proxyignores.golden.yml | 4 ++++ ...inject_emojivoto_pod_with_requests.golden.yml | 4 ++++ .../inject_emojivoto_statefulset.golden.yml | 4 ++++ .../inject_gettest_deployment.good.golden.yml | 8 ++++++++ .../inject_tap_deployment_debug.golden.yml | 4 ++++ .../install_controlplane_tracing_output.golden | 12 ++++++++++++ cli/cmd/testdata/install_custom_domain.golden | 12 ++++++++++++ cli/cmd/testdata/install_custom_registry.golden | 12 ++++++++++++ cli/cmd/testdata/install_default.golden | 12 ++++++++++++ .../install_default_override_dst_get_nets.golden | 12 ++++++++++++ cli/cmd/testdata/install_default_token.golden | 12 ++++++++++++ cli/cmd/testdata/install_gid_output.golden | 12 ++++++++++++ cli/cmd/testdata/install_ha_output.golden | 12 ++++++++++++ .../install_ha_with_overrides_output.golden | 12 ++++++++++++ .../install_heartbeat_disabled_output.golden | 12 ++++++++++++ .../install_helm_control_plane_output.golden | 12 ++++++++++++ .../install_helm_control_plane_output_ha.golden | 12 ++++++++++++ ..._helm_control_plane_output_ha_with_gid.golden | 12 ++++++++++++ .../install_helm_output_ha_labels.golden | 12 ++++++++++++ ...tall_helm_output_ha_namespace_selector.golden | 12 ++++++++++++ .../testdata/install_no_init_container.golden | 12 ++++++++++++ cli/cmd/testdata/install_output.golden | 12 ++++++++++++ cli/cmd/testdata/install_proxy_ignores.golden | 12 ++++++++++++ cli/cmd/testdata/install_values_file.golden | 12 ++++++++++++ .../fake/data/pod-with-debug.patch.json | 8 ++++++++ .../fake/data/pod-with-ns-annotations.patch.json | 8 ++++++++ .../proxy-injector/fake/data/pod.patch.json | 8 ++++++++ 53 files changed, 408 insertions(+) diff --git a/charts/partials/templates/_proxy.tpl b/charts/partials/templates/_proxy.tpl index 7880b394c4dd8..4dcf12dee2c1c 100644 --- a/charts/partials/templates/_proxy.tpl +++ b/charts/partials/templates/_proxy.tpl @@ -112,6 +112,10 @@ env: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms +- name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s +- name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s {{- /* Configure inbound and outbound parameters, e.g. for HTTP/2 servers. */}} {{ range $proxyK, $proxyV := (dict "inbound" .Values.proxy.inbound "outbound" .Values.proxy.outbound) -}} {{ range $scopeK, $scopeV := $proxyV -}} diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml index 85d02c3730db1..f907a1eaf48fb 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx.yaml @@ -87,6 +87,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 959f6c19497c3..de5eab25d101f 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_nginx_redis.yaml @@ -87,6 +87,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -317,6 +321,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml index d1478b2c6093e..13111febda930 100644 --- a/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml +++ b/cli/cmd/testdata/inject-filepath/expected/injected_redis.yaml @@ -87,6 +87,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_contour.golden.yml b/cli/cmd/testdata/inject_contour.golden.yml index c65e019c44e55..5cae804d51ffd 100644 --- a/cli/cmd/testdata/inject_contour.golden.yml +++ b/cli/cmd/testdata/inject_contour.golden.yml @@ -95,6 +95,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml index 48b6f480e6419..d67f7e0fc35fc 100644 --- a/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_already_injected.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -330,6 +334,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -571,6 +579,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -812,6 +824,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml index 2721acda21760..cc05acf71911d 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 a5bb9f2616f29..695b298db78e2 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_access_log.golden.yml @@ -90,6 +90,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 8bb27f4efd6f0..5deb2ac9132bf 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_automountServiceAccountToken_false.golden.yml @@ -90,6 +90,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml index 7e076812837ed..920497cae276f 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_capabilities.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 68f713ae93810..12f0e3c9472cc 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_config_overrides.golden.yml @@ -99,6 +99,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 733e8aed325f3..1c4d55053f304 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_controller_name.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -330,6 +334,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml index 0cf5dd93ba9e7..ab4aec7c543ce 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_debug.golden.yml @@ -90,6 +90,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 59a148576ac88..100d979947a9b 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_empty_resources.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 d7387cedfd254..04d5706edf596 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_hostNetwork_false.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 e15f2ebef69d2..42b5aee4452ce 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_native_sidecar.golden.yml @@ -137,6 +137,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 9d9e93e325655..0df2877ebdefd 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 @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 fe08db54be53f..8c19bd0c75944 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_opaque_ports.golden.yml @@ -90,6 +90,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml index 11fe92ad7f73f..0eb9f4f510029 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_overridden.golden.yml @@ -90,6 +90,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml index 075a938c2e490..ad2469d47b154 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_params.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SCOPE_PROTO_APPLE_SAUCE value: valueA - name: LINKERD2_PROXY_INBOUND_SCOPE_PROTO_BLUEBERRY diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml index e0163dc7984dd..8cd413b9d6489 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_proxyignores.golden.yml @@ -91,6 +91,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml index 50dc5da37e44f..4e0d4deee20e5 100644 --- a/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_deployment_udp.golden.yml @@ -89,6 +89,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_list.golden.yml b/cli/cmd/testdata/inject_emojivoto_list.golden.yml index f92ac5de1af32..5afb5b55a3c5d 100644 --- a/cli/cmd/testdata/inject_emojivoto_list.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list.golden.yml @@ -91,6 +91,10 @@ items: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -331,6 +335,10 @@ items: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 a9c9b975f398f..3205af6753769 100644 --- a/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_list_empty_resources.golden.yml @@ -91,6 +91,10 @@ items: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -331,6 +335,10 @@ items: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml index 86af340646d6d..2d5da53965720 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod.golden.yml @@ -80,6 +80,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml index 76f620f4910ed..9698461a715a2 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_ingress.golden.yml @@ -83,6 +83,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml index df7af039b5b7e..b2362598e0172 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_proxyignores.golden.yml @@ -82,6 +82,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 e0c9747fbdf99..4eafe1fd2b880 100644 --- a/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_pod_with_requests.golden.yml @@ -84,6 +84,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml index 13d7ec9f75416..6b5178e175282 100644 --- a/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml +++ b/cli/cmd/testdata/inject_emojivoto_statefulset.golden.yml @@ -90,6 +90,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml index fce7dea46272d..f5007a5d108e7 100644 --- a/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml +++ b/cli/cmd/testdata/inject_gettest_deployment.good.golden.yml @@ -85,6 +85,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -328,6 +332,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml index 8aa9ffaa480fc..eaf7d53ca7512 100644 --- a/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml +++ b/cli/cmd/testdata/inject_tap_deployment_debug.golden.yml @@ -106,6 +106,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: 10s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_controlplane_tracing_output.golden b/cli/cmd/testdata/install_controlplane_tracing_output.golden index ab1bdd0861fa5..45920dbf30fa0 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -1038,6 +1038,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1384,6 +1388,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1832,6 +1840,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_custom_domain.golden b/cli/cmd/testdata/install_custom_domain.golden index a6155034c3f51..8f955a89e666e 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1383,6 +1387,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1830,6 +1838,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 0283388a3aa68..b2d6191debcde 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1383,6 +1387,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1830,6 +1838,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_default.golden b/cli/cmd/testdata/install_default.golden index a6155034c3f51..8f955a89e666e 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1383,6 +1387,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1830,6 +1838,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 dec936b3c1cec..60d7638fa3064 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1383,6 +1387,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1830,6 +1838,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_default_token.golden b/cli/cmd/testdata/install_default_token.golden index dc9aad80ee366..08ce263f9f19d 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1374,6 +1378,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1812,6 +1820,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_gid_output.golden b/cli/cmd/testdata/install_gid_output.golden index dcc89dd491659..b8ce07b688120 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -1038,6 +1038,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1387,6 +1391,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1841,6 +1849,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_ha_output.golden b/cli/cmd/testdata/install_ha_output.golden index 1c064fe8b7878..895bdee3569b5 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -1114,6 +1114,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1505,6 +1509,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1993,6 +2001,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_ha_with_overrides_output.golden b/cli/cmd/testdata/install_ha_with_overrides_output.golden index 3c13ef9c2c109..6bd2012e35619 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -1114,6 +1114,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1505,6 +1509,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1993,6 +2001,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_heartbeat_disabled_output.golden b/cli/cmd/testdata/install_heartbeat_disabled_output.golden index 67a31183839dc..b86a0985eff21 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -968,6 +968,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1314,6 +1318,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1701,6 +1709,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index 7025eedaaafc6..1c4f2d46e72ae 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -1010,6 +1010,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1358,6 +1362,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1809,6 +1817,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 0ebd926950586..010563cface4d 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -1087,6 +1087,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1480,6 +1484,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1972,6 +1980,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 40e261f23b36c..756bcb872830a 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 @@ -1088,6 +1088,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1484,6 +1488,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1983,6 +1991,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index 0652e150cd4c8..31301960db9dc 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -1095,6 +1095,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1492,6 +1496,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1992,6 +2000,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 27cfe2cea184f..d0a27df694bf6 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -1077,6 +1077,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1470,6 +1474,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1962,6 +1970,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_no_init_container.golden b/cli/cmd/testdata/install_no_init_container.golden index acfbce9746878..082b5f6a1adb9 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1376,6 +1380,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1816,6 +1824,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_output.golden b/cli/cmd/testdata/install_output.golden index 2abbe3ada929f..6e533b824ea59 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -983,6 +983,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION value: "25,443,587,3306,5432,11211" - name: LINKERD2_PROXY_DESTINATION_CONTEXT @@ -1326,6 +1330,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION value: "25,443,587,3306,5432,11211" - name: LINKERD2_PROXY_DESTINATION_CONTEXT @@ -1780,6 +1788,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_PORTS_DISABLE_PROTOCOL_DETECTION value: "25,443,587,3306,5432,11211" - name: LINKERD2_PROXY_DESTINATION_CONTEXT diff --git a/cli/cmd/testdata/install_proxy_ignores.golden b/cli/cmd/testdata/install_proxy_ignores.golden index 74e1ebc27e27f..41c5cd96d5189 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1383,6 +1387,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1830,6 +1838,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT diff --git a/cli/cmd/testdata/install_values_file.golden b/cli/cmd/testdata/install_values_file.golden index 146789a870cdf..f391c60a40968 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -1037,6 +1037,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1383,6 +1387,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT @@ -1830,6 +1838,10 @@ spec: value: 10000ms - name: LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE value: 10000ms + - name: LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT + value: 30s + - name: LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT + value: 30s - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL value: "10s" - name: LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_TIMEOUT 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 4c5a7ad6fe29c..6d38a2eb08c9f 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -274,6 +274,14 @@ "name": "LINKERD2_PROXY_INBOUND_ACCEPT_KEEPALIVE", "value": "10000ms" }, + { + "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT", + "value": "30s" + }, + { + "name": "LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT", + "value": "30s" + }, { "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE", "value": "10000ms" 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 fed4780caa88a..ec21aa27cffba 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 @@ -264,6 +264,14 @@ "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE", "value": "10000ms" }, + { + "name": "LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT", + "value": "30s" + }, + { + "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT", + "value": "30s" + }, { "name": "LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL", "value": "10s" diff --git a/controller/proxy-injector/fake/data/pod.patch.json b/controller/proxy-injector/fake/data/pod.patch.json index df06bfdc7915d..87db61d207536 100644 --- a/controller/proxy-injector/fake/data/pod.patch.json +++ b/controller/proxy-injector/fake/data/pod.patch.json @@ -254,6 +254,14 @@ "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE", "value": "10000ms" }, + { + "name": "LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT", + "value": "30s" + }, + { + "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT", + "value": "30s" + }, { "name": "LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL", "value": "10s" From e219760504196be32af75348bcd8dd57f0831cf5 Mon Sep 17 00:00:00 2001 From: UsingCoding Date: Thu, 26 Sep 2024 19:11:22 +0000 Subject: [PATCH 2/2] Fix USER_TIMEOUT env parameters order in pod-with-debug.patch.json Signed-off-by: UsingCoding --- .../proxy-injector/fake/data/pod-with-debug.patch.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 6d38a2eb08c9f..4dcbceb99ee6b 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -275,16 +275,16 @@ "value": "10000ms" }, { - "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT", - "value": "30s" + "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE", + "value": "10000ms" }, { "name": "LINKERD2_PROXY_INBOUND_ACCEPT_USER_TIMEOUT", "value": "30s" }, { - "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_KEEPALIVE", - "value": "10000ms" + "name": "LINKERD2_PROXY_OUTBOUND_CONNECT_USER_TIMEOUT", + "value": "30s" }, { "name": "LINKERD2_PROXY_INBOUND_SERVER_HTTP2_KEEP_ALIVE_INTERVAL",