diff --git a/linkerd.io/content/2-edge/reference/proxy-configuration.md b/linkerd.io/content/2-edge/reference/proxy-configuration.md index 377acf9999..c570e7faff 100644 --- a/linkerd.io/content/2-edge/reference/proxy-configuration.md +++ b/linkerd.io/content/2-edge/reference/proxy-configuration.md @@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.10/reference/proxy-configuration.md b/linkerd.io/content/2.10/reference/proxy-configuration.md index fa9aa8997e..66916221a1 100644 --- a/linkerd.io/content/2.10/reference/proxy-configuration.md +++ b/linkerd.io/content/2.10/reference/proxy-configuration.md @@ -46,7 +46,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by used the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by used the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.11/reference/proxy-configuration.md b/linkerd.io/content/2.11/reference/proxy-configuration.md index fa9aa8997e..66916221a1 100644 --- a/linkerd.io/content/2.11/reference/proxy-configuration.md +++ b/linkerd.io/content/2.11/reference/proxy-configuration.md @@ -46,7 +46,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by used the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by used the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.12/reference/proxy-configuration.md b/linkerd.io/content/2.12/reference/proxy-configuration.md index 377acf9999..c570e7faff 100644 --- a/linkerd.io/content/2.12/reference/proxy-configuration.md +++ b/linkerd.io/content/2.12/reference/proxy-configuration.md @@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.13/reference/proxy-configuration.md b/linkerd.io/content/2.13/reference/proxy-configuration.md index 377acf9999..c570e7faff 100644 --- a/linkerd.io/content/2.13/reference/proxy-configuration.md +++ b/linkerd.io/content/2.13/reference/proxy-configuration.md @@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.14/reference/proxy-configuration.md b/linkerd.io/content/2.14/reference/proxy-configuration.md index 377acf9999..c570e7faff 100644 --- a/linkerd.io/content/2.14/reference/proxy-configuration.md +++ b/linkerd.io/content/2.14/reference/proxy-configuration.md @@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.15/reference/proxy-configuration.md b/linkerd.io/content/2.15/reference/proxy-configuration.md index 377acf9999..c570e7faff 100644 --- a/linkerd.io/content/2.15/reference/proxy-configuration.md +++ b/linkerd.io/content/2.15/reference/proxy-configuration.md @@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.16/reference/proxy-configuration.md b/linkerd.io/content/2.16/reference/proxy-configuration.md index 377acf9999..c570e7faff 100644 --- a/linkerd.io/content/2.16/reference/proxy-configuration.md +++ b/linkerd.io/content/2.16/reference/proxy-configuration.md @@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/content/2.17/reference/proxy-configuration.md b/linkerd.io/content/2.17/reference/proxy-configuration.md index 377acf9999..c570e7faff 100644 --- a/linkerd.io/content/2.17/reference/proxy-configuration.md +++ b/linkerd.io/content/2.17/reference/proxy-configuration.md @@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the endpoint selection of the ingress container and to perform its own endpoint selection, enabling features such as per-route metrics and traffic splitting. -The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject: +The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject: ingress` annotation rather than the default `linkerd.io/inject: enabled` annotation. This can also be done with the `--ingress` flag in the `inject` CLI command: diff --git a/linkerd.io/data/cli/2-10.yaml b/linkerd.io/data/cli/2-10.yaml index 53a1166972..388ca94779 100644 --- a/linkerd.io/data/cli/2-10.yaml +++ b/linkerd.io/data/cli/2-10.yaml @@ -62,7 +62,7 @@ AnnotationsReference: - 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 - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. If not provided, it will be defaulted to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds CLIReference: diff --git a/linkerd.io/data/cli/2-11.yaml b/linkerd.io/data/cli/2-11.yaml index 8d50ee9a49..247f74064a 100644 --- a/linkerd.io/data/cli/2-11.yaml +++ b/linkerd.io/data/cli/2-11.yaml @@ -62,7 +62,7 @@ AnnotationsReference: - 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 - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. If not provided, it will be defaulted to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready; diff --git a/linkerd.io/data/cli/2-12.yaml b/linkerd.io/data/cli/2-12.yaml index 5aab7505e8..264efb3060 100644 --- a/linkerd.io/data/cli/2-12.yaml +++ b/linkerd.io/data/cli/2-12.yaml @@ -60,7 +60,7 @@ AnnotationsReference: - Description: Log format (plain or json) for the proxy Name: config.linkerd.io/proxy-log-format - Description: Enables HTTP access logging in the proxy. Accepted values are `apache`, - to output the access log in the Appache Common Log Format, and `json`, to output + to output the access log in the Apache Common Log Format, and `json`, to output the access log in JSON. Name: config.linkerd.io/access-log - Description: Enable service profiles for non-Kubernetes services @@ -76,7 +76,7 @@ AnnotationsReference: - 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 after - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready; diff --git a/linkerd.io/data/cli/2-13.yaml b/linkerd.io/data/cli/2-13.yaml index 97de9dbc5d..8ff0a92080 100644 --- a/linkerd.io/data/cli/2-13.yaml +++ b/linkerd.io/data/cli/2-13.yaml @@ -60,7 +60,7 @@ AnnotationsReference: - Description: Log format (plain or json) for the proxy Name: config.linkerd.io/proxy-log-format - Description: Enables HTTP access logging in the proxy. Accepted values are `apache`, - to output the access log in the Appache Common Log Format, and `json`, to output + to output the access log in the Apache Common Log Format, and `json`, to output the access log in JSON. Name: config.linkerd.io/access-log - Description: Enable service profiles for non-Kubernetes services @@ -82,7 +82,7 @@ AnnotationsReference: 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 after - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready; diff --git a/linkerd.io/data/cli/2-14.yaml b/linkerd.io/data/cli/2-14.yaml index d9b53df957..2a26ad37f9 100644 --- a/linkerd.io/data/cli/2-14.yaml +++ b/linkerd.io/data/cli/2-14.yaml @@ -60,7 +60,7 @@ AnnotationsReference: - Description: Log format (plain or json) for the proxy Name: config.linkerd.io/proxy-log-format - Description: Enables HTTP access logging in the proxy. Accepted values are `apache`, - to output the access log in the Appache Common Log Format, and `json`, to output + to output the access log in the Apache Common Log Format, and `json`, to output the access log in JSON. Name: config.linkerd.io/access-log - Description: Enable service profiles for non-Kubernetes services @@ -88,7 +88,7 @@ AnnotationsReference: 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 after - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready; diff --git a/linkerd.io/data/cli/2-15.yaml b/linkerd.io/data/cli/2-15.yaml index 925eae37ff..4973ad45da 100644 --- a/linkerd.io/data/cli/2-15.yaml +++ b/linkerd.io/data/cli/2-15.yaml @@ -60,7 +60,7 @@ AnnotationsReference: - Description: Log format (plain or json) for the proxy Name: config.linkerd.io/proxy-log-format - Description: Enables HTTP access logging in the proxy. Accepted values are `apache`, - to output the access log in the Appache Common Log Format, and `json`, to output + to output the access log in the Apache Common Log Format, and `json`, to output the access log in JSON. Name: config.linkerd.io/access-log - Description: Enable service profiles for non-Kubernetes services @@ -88,7 +88,7 @@ AnnotationsReference: 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 after - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready; diff --git a/linkerd.io/data/cli/2-16.yaml b/linkerd.io/data/cli/2-16.yaml index 6ccc7ade54..8fa0e5b071 100644 --- a/linkerd.io/data/cli/2-16.yaml +++ b/linkerd.io/data/cli/2-16.yaml @@ -62,7 +62,7 @@ AnnotationsReference: - Description: Log format (plain or json) for the proxy Name: config.linkerd.io/proxy-log-format - Description: Enables HTTP access logging in the proxy. Accepted values are `apache`, - to output the access log in the Appache Common Log Format, and `json`, to output + to output the access log in the Apache Common Log Format, and `json`, to output the access log in JSON. Name: config.linkerd.io/access-log - Description: Enable service profiles for non-Kubernetes services @@ -91,7 +91,7 @@ AnnotationsReference: 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 after - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready; diff --git a/linkerd.io/data/cli/2-17.yaml b/linkerd.io/data/cli/2-17.yaml index 49a1e8650e..63173ef2de 100644 --- a/linkerd.io/data/cli/2-17.yaml +++ b/linkerd.io/data/cli/2-17.yaml @@ -62,7 +62,7 @@ AnnotationsReference: - Description: Log format (plain or json) for the proxy Name: config.linkerd.io/proxy-log-format - Description: Enables HTTP access logging in the proxy. Accepted values are `apache`, - to output the access log in the Appache Common Log Format, and `json`, to output + to output the access log in the Apache Common Log Format, and `json`, to output the access log in JSON. Name: config.linkerd.io/access-log - Description: Enable service profiles for non-Kubernetes services @@ -91,7 +91,7 @@ AnnotationsReference: 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 after - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready; diff --git a/linkerd.io/data/cli/2-edge.yaml b/linkerd.io/data/cli/2-edge.yaml index 925eae37ff..4973ad45da 100644 --- a/linkerd.io/data/cli/2-edge.yaml +++ b/linkerd.io/data/cli/2-edge.yaml @@ -60,7 +60,7 @@ AnnotationsReference: - Description: Log format (plain or json) for the proxy Name: config.linkerd.io/proxy-log-format - Description: Enables HTTP access logging in the proxy. Accepted values are `apache`, - to output the access log in the Appache Common Log Format, and `json`, to output + to output the access log in the Apache Common Log Format, and `json`, to output the access log in JSON. Name: config.linkerd.io/access-log - Description: Enable service profiles for non-Kubernetes services @@ -88,7 +88,7 @@ AnnotationsReference: 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 after - receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`. + receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`. Defaults to `0` Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds - Description: The application container will not start until the proxy is ready;