From 911bb4a1aa508093e813723f7bb057c3b28824fd Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Thu, 10 Mar 2022 19:55:07 +0000 Subject: [PATCH] backport of commit d5a90f1169d9714d5ad93dfac2dfe66a0c7a41b8 --- website/content/docs/commands/index.mdx | 9 ++++++--- .../content/docs/platform/k8s/injector/annotations.mdx | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/website/content/docs/commands/index.mdx b/website/content/docs/commands/index.mdx index 9af192f048fd..7679de78626c 100644 --- a/website/content/docs/commands/index.mdx +++ b/website/content/docs/commands/index.mdx @@ -172,7 +172,7 @@ Or specify the contents of a file as a value: $ vault kv put secret/password value=@data.txt ``` -Note that if an argument is supplied in a @key=value format, Vault will treat that as a +Note that if an argument is supplied in a @key=value format, Vault will treat that as a kv pair with the key being `@key`, not a file called `key=value`. This also means that Vault does not support filenames with `=` in them. @@ -263,8 +263,11 @@ This takes precedence over [license_path in config](/docs/configuration#license_ ### `VAULT_MAX_RETRIES` -Maximum number of retries when a `5xx` error code is encountered. The default is -`2`, for three total attempts. Set this to `0` or less to disable retrying. +Maximum number of retries when certain error codes are encountered. The default +is `2`, for three total attempts. Set this to `0` or less to disable retrying. + +Error codes that are retried are 412 (client consistency requirement not +satisfied) and all 5xx except for 501 (not implemented). ### `VAULT_REDIRECT_ADDR` diff --git a/website/content/docs/platform/k8s/injector/annotations.mdx b/website/content/docs/platform/k8s/injector/annotations.mdx index 1c6e0f783a15..95703b39e10a 100644 --- a/website/content/docs/platform/k8s/injector/annotations.mdx +++ b/website/content/docs/platform/k8s/injector/annotations.mdx @@ -222,7 +222,9 @@ etc. with Vault via mTLS. - `vault.hashicorp.com/client-max-retries` - configures number of Vault Agent retry - attempts when 5xx errors are encountered. Defaults to 2. + attempts when certain errors are encountered. Defaults to 2, for 3 total attempts. + Set this to `0` or less to disable retrying. Error codes that are retried are 412 + (client consistency requirement not satisfied) and all 5xx except for 501 (not implemented). - `vault.hashicorp.com/client-timeout` - configures the request timeout threshold, in seconds, of the Vault Agent when communicating with Vault. Defaults to `60s`