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 36a50e5b0a0ff..d094667748794 100644 --- a/cli/cmd/testdata/install_controlplane_tracing_output.golden +++ b/cli/cmd/testdata/install_controlplane_tracing_output.golden @@ -1045,6 +1045,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 @@ -1391,6 +1395,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 @@ -1843,6 +1851,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 21eab651d3d36..610f123616084 100644 --- a/cli/cmd/testdata/install_custom_domain.golden +++ b/cli/cmd/testdata/install_custom_domain.golden @@ -1044,6 +1044,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 @@ -1390,6 +1394,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_custom_registry.golden b/cli/cmd/testdata/install_custom_registry.golden index 66f814a57536e..3db6f638937d3 100644 --- a/cli/cmd/testdata/install_custom_registry.golden +++ b/cli/cmd/testdata/install_custom_registry.golden @@ -1044,6 +1044,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 @@ -1390,6 +1394,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_default.golden b/cli/cmd/testdata/install_default.golden index 21eab651d3d36..610f123616084 100644 --- a/cli/cmd/testdata/install_default.golden +++ b/cli/cmd/testdata/install_default.golden @@ -1044,6 +1044,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 @@ -1390,6 +1394,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_default_override_dst_get_nets.golden b/cli/cmd/testdata/install_default_override_dst_get_nets.golden index 7fece7a246804..5f30f80edb170 100644 --- a/cli/cmd/testdata/install_default_override_dst_get_nets.golden +++ b/cli/cmd/testdata/install_default_override_dst_get_nets.golden @@ -1044,6 +1044,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 @@ -1390,6 +1394,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_default_token.golden b/cli/cmd/testdata/install_default_token.golden index 90c3049219e20..33209a3973b17 100644 --- a/cli/cmd/testdata/install_default_token.golden +++ b/cli/cmd/testdata/install_default_token.golden @@ -1044,6 +1044,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 @@ -1381,6 +1385,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 @@ -1823,6 +1831,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 a791a731b8e56..5b5ea80fdb879 100755 --- a/cli/cmd/testdata/install_gid_output.golden +++ b/cli/cmd/testdata/install_gid_output.golden @@ -1045,6 +1045,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 @@ -1394,6 +1398,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 @@ -1852,6 +1860,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 dcb8d74061038..f108d4f27a93f 100644 --- a/cli/cmd/testdata/install_ha_output.golden +++ b/cli/cmd/testdata/install_ha_output.golden @@ -1121,6 +1121,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 @@ -1512,6 +1516,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 @@ -2004,6 +2012,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 f10788e6319e8..e5e4c54ce623d 100644 --- a/cli/cmd/testdata/install_ha_with_overrides_output.golden +++ b/cli/cmd/testdata/install_ha_with_overrides_output.golden @@ -1121,6 +1121,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 @@ -1512,6 +1516,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 @@ -2004,6 +2012,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 17fbd419a50fc..b7db890d1ef76 100644 --- a/cli/cmd/testdata/install_heartbeat_disabled_output.golden +++ b/cli/cmd/testdata/install_heartbeat_disabled_output.golden @@ -975,6 +975,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 @@ -1321,6 +1325,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 @@ -1712,6 +1720,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 6ebfd35aa41d4..f54b7d98fd03b 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -1017,6 +1017,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 @@ -1365,6 +1369,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 @@ -1820,6 +1828,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 312d6d985ae04..64620c8b4f7db 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -1094,6 +1094,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 @@ -1487,6 +1491,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_control_plane_output_ha_with_gid.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha_with_gid.golden index 0b9a353fb4837..08cea0afba854 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 @@ -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 @@ -1491,6 +1495,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 @@ -1994,6 +2002,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 29767c48fdedf..c758066eda37c 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -1102,6 +1102,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 @@ -1499,6 +1503,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 @@ -2003,6 +2011,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 fb9a0b392448f..da4dba96357e3 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -1084,6 +1084,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 @@ -1477,6 +1481,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 @@ -1973,6 +1981,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 b8fe6d21552b0..5d3be4b313516 100644 --- a/cli/cmd/testdata/install_no_init_container.golden +++ b/cli/cmd/testdata/install_no_init_container.golden @@ -1044,6 +1044,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 @@ -1827,6 +1835,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 68c4c487e1fd3..a76efb7cd046f 100644 --- a/cli/cmd/testdata/install_output.golden +++ b/cli/cmd/testdata/install_output.golden @@ -982,6 +982,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 @@ -1325,6 +1329,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 @@ -1779,6 +1787,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 88c2b6ee688c8..9a12c9a2275c3 100644 --- a/cli/cmd/testdata/install_proxy_ignores.golden +++ b/cli/cmd/testdata/install_proxy_ignores.golden @@ -1044,6 +1044,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 @@ -1390,6 +1394,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_values_file.golden b/cli/cmd/testdata/install_values_file.golden index b4feb9e83142a..83bb06e43956a 100644 --- a/cli/cmd/testdata/install_values_file.golden +++ b/cli/cmd/testdata/install_values_file.golden @@ -1044,6 +1044,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 @@ -1390,6 +1394,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/controller/proxy-injector/fake/data/pod-with-debug.patch.json b/controller/proxy-injector/fake/data/pod-with-debug.patch.json index 4c5a7ad6fe29c..4dcbceb99ee6b 100644 --- a/controller/proxy-injector/fake/data/pod-with-debug.patch.json +++ b/controller/proxy-injector/fake/data/pod-with-debug.patch.json @@ -278,6 +278,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-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"