Skip to content

Commit

Permalink
Merge branch 'release/1.9.x' into backport/ksatirli-patch-1/scarcely-…
Browse files Browse the repository at this point in the history
…discrete-boxer
  • Loading branch information
hashishaw committed Jun 14, 2022
2 parents a26b301 + a96ab16 commit e9dd359
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions website/content/docs/platform/k8s/injector/annotations.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ them, optional commands to run, etc.
Agent configuration file and templates can be found.

- `vault.hashicorp.com/agent-image` - name of the Vault docker image to use. This
value overrides the default image configured in the controller and is usually
value overrides the default image configured in the injector and is usually
not needed. Defaults to `hashicorp/vault:1.9.2`.

- `vault.hashicorp.com/agent-init-first` - configures the pod to run the Vault Agent
Expand Down Expand Up @@ -245,9 +245,10 @@ etc.
- `vault.hashicorp.com/role` - configures the Vault role used by the Vault Agent
auto-auth method. Required when `vault.hashicorp.com/agent-configmap` is not set.

- `vault.hashicorp.com/service` - name of the Vault service to use. This value
overrides the default service configured in the controller and is usually not
needed.
- `vault.hashicorp.com/service` - configures the Vault address for the injected
Vault Agent to use. This value overrides the default Vault address configured
in the injector, and may either be the address of a Vault service within the
same Kubernetes cluster as the injector, or an external Vault URL.

- `vault.hashicorp.com/tls-secret` - name of the Kubernetes secret containing TLS
Client and CA certificates and keys. This is mounted to `/vault/tls`.
Expand Down

0 comments on commit e9dd359

Please sign in to comment.