Skip to content

Commit

Permalink
backport of commit d5a90f1 (#14451)
Browse files Browse the repository at this point in the history
Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
  • Loading branch information
1 parent 4dd0ed5 commit 613c5a8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
9 changes: 6 additions & 3 deletions website/content/docs/commands/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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`

Expand Down
4 changes: 3 additions & 1 deletion website/content/docs/platform/k8s/injector/annotations.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit 613c5a8

Please sign in to comment.