diff --git a/linkerd.io/data/cli-2-10.yaml b/linkerd.io/data/cli-2-10.yaml index 53a1166972..b0964e4de4 100644 --- a/linkerd.io/data/cli-2-10.yaml +++ b/linkerd.io/data/cli-2-10.yaml @@ -61,7 +61,7 @@ AnnotationsReference: Name: config.linkerd.io/enable-debug-sidecar - Description: Used to configure the outbound TCP connection timeout in the proxy Name: config.linkerd.io/proxy-outbound-connect-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. If not provided, it will be defaulted to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds @@ -2785,4 +2785,3 @@ CLIReference: SeeAlso: null Synopsis: | viz manages the linkerd-viz extension of Linkerd service mesh - diff --git a/linkerd.io/data/cli-2-11.yaml b/linkerd.io/data/cli-2-11.yaml index 8d50ee9a49..b034b91c32 100644 --- a/linkerd.io/data/cli-2-11.yaml +++ b/linkerd.io/data/cli-2-11.yaml @@ -61,7 +61,7 @@ AnnotationsReference: Name: config.linkerd.io/enable-debug-sidecar - Description: Used to configure the outbound TCP connection timeout in the proxy Name: config.linkerd.io/proxy-outbound-connect-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. If not provided, it will be defaulted to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds @@ -2815,4 +2815,3 @@ CLIReference: SeeAlso: null Synopsis: | viz manages the linkerd-viz extension of Linkerd service mesh - diff --git a/linkerd.io/data/cli-2-12.yaml b/linkerd.io/data/cli-2-12.yaml index d107d595aa..6804063df9 100644 --- a/linkerd.io/data/cli-2-12.yaml +++ b/linkerd.io/data/cli-2-12.yaml @@ -75,7 +75,7 @@ AnnotationsReference: Name: config.linkerd.io/proxy-outbound-connect-timeout - Description: Inbound TCP connection timeout in the proxy Name: config.linkerd.io/proxy-inbound-connect-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds diff --git a/linkerd.io/data/cli-2-13.yaml b/linkerd.io/data/cli-2-13.yaml index 1434e4ca1a..e91677cd3e 100644 --- a/linkerd.io/data/cli-2-13.yaml +++ b/linkerd.io/data/cli-2-13.yaml @@ -81,7 +81,7 @@ AnnotationsReference: - Description: Maximum time allowed before an unused inbound discovery result is evicted from the cache. Defaults to `90s` Name: config.linkerd.io/proxy-inbound-discovery-cache-unused-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds diff --git a/linkerd.io/data/cli-2-14.yaml b/linkerd.io/data/cli-2-14.yaml index ecbf4bda04..922bbef1d6 100644 --- a/linkerd.io/data/cli-2-14.yaml +++ b/linkerd.io/data/cli-2-14.yaml @@ -87,7 +87,7 @@ AnnotationsReference: - Description: When set to true, disables the protocol detection timeout on the inbound side of the proxy by setting it to a very high value Name: config.linkerd.io/proxy-disable-inbound-protocol-detect-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds diff --git a/linkerd.io/data/cli-2-15.yaml b/linkerd.io/data/cli-2-15.yaml index 695b0f30c5..2534f6457c 100644 --- a/linkerd.io/data/cli-2-15.yaml +++ b/linkerd.io/data/cli-2-15.yaml @@ -87,7 +87,7 @@ AnnotationsReference: - Description: When set to true, disables the protocol detection timeout on the inbound side of the proxy by setting it to a very high value Name: config.linkerd.io/proxy-disable-inbound-protocol-detect-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds diff --git a/linkerd.io/data/cli-2-16.yaml b/linkerd.io/data/cli-2-16.yaml index 6fafbe546e..217ae89a2b 100644 --- a/linkerd.io/data/cli-2-16.yaml +++ b/linkerd.io/data/cli-2-16.yaml @@ -90,7 +90,7 @@ AnnotationsReference: - Description: When set to true, disables the protocol detection timeout on the inbound side of the proxy by setting it to a very high value Name: config.linkerd.io/proxy-disable-inbound-protocol-detect-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds diff --git a/linkerd.io/data/cli-2-edge.yaml b/linkerd.io/data/cli-2-edge.yaml index 695b0f30c5..2534f6457c 100644 --- a/linkerd.io/data/cli-2-edge.yaml +++ b/linkerd.io/data/cli-2-edge.yaml @@ -87,7 +87,7 @@ AnnotationsReference: - Description: When set to true, disables the protocol detection timeout on the inbound side of the proxy by setting it to a very high value Name: config.linkerd.io/proxy-disable-inbound-protocol-detect-timeout -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds diff --git a/linkerd.io/data/cli.yaml b/linkerd.io/data/cli.yaml index b12cea7208..cfc92418ec 100644 --- a/linkerd.io/data/cli.yaml +++ b/linkerd.io/data/cli.yaml @@ -52,7 +52,7 @@ AnnotationsReference: - Description: The trace collector's service account name. E.g., `tracing-service-account`. If not provided, it will be defaulted to `default`. Name: config.alpha.linkerd.io/trace-collector-service-account -- Description: The proxy sidecar will stay alive for at least the given period before +- Description: Adds a preStop hook to the proxy container to delay receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. If not provided, it will be defaulted to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds @@ -1890,4 +1890,3 @@ CLIReference: Usage: Print the version number(s) only, with no additional output SeeAlso: null Synopsis: Print the client and server version information -