backport of commit 3f6cf98 (#28871)

Co-authored-by: Theron Voran <[email protected]>

website/content/docs/configuration/service-registration/kubernetes.mdx

@@ -71,7 +71,7 @@ metadata:
     vault-initialized: "true"
     vault-perf-standby: "false"
     vault-sealed: "false"
-    vault-version: 1.17.2
+    vault-version: 1.18.1
 ```
 
 After shutdowns, Vault pods will bear the following labels:
@@ -86,7 +86,7 @@ metadata:
     vault-initialized: "false"
     vault-perf-standby: "false"
     vault-sealed: "true"
-    vault-version: 1.17.2
+    vault-version: 1.18.1
 ```
 
 ## Label definitions
@@ -102,7 +102,7 @@ metadata:
 - `vault-sealed` `(string: "true"/"false")` – Vault sealed is updated dynamically each
   time Vault's sealed/unsealed status changes. True indicates that Vault is currently sealed. False indicates that Vault
   is currently unsealed.
-- `vault-version` `(string: "1.17.2")` – Vault version is a string that will not change during a pod's lifecycle.
+- `vault-version` `(string: "1.18.1")` – Vault version is a string that will not change during a pod's lifecycle.
 
 ## Working with vault's service discovery labels
 
@@ -118,7 +118,7 @@ metadata:
   labels:
     app.kubernetes.io/instance: vault
     app.kubernetes.io/name: vault
-    helm.sh/chart: vault-0.28.1
+    helm.sh/chart: vault-0.29.0
   name: vault-active-us-east
   namespace: default
 spec:
@@ -156,7 +156,7 @@ $ vault write -f sys/replication/performance/primary/enable \
 In conjunction with the pod labels and the `OnDelete` upgrade strategy, upgrades are much easier to orchestrate:
 
 ```shell-session
-$ helm upgrade vault --set='server.image.tag=1.17.2'
+$ helm upgrade vault --set='server.image.tag=1.18.1'
 
 $ kubectl delete pod --selector=vault-active=false \
     --selector=vault-version=1.2.3

website/content/docs/platform/k8s/helm/configuration.mdx

@@ -79,15 +79,15 @@ and consider if they're appropriate for your deployment.
 
     - `repository` (`string: "hashicorp/vault-k8s"`) - The name of the Docker image for Vault Agent Injector.
 
-    - `tag` (`string: "1.4.2"`) - The tag of the Docker image for the Vault Agent Injector. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
+    - `tag` (`string: "1.5.0"`) - The tag of the Docker image for the Vault Agent Injector. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
 
     - `pullPolicy` (`string: "IfNotPresent"`) - The pull policy for container images. The default pull policy is `IfNotPresent` which causes the Kubelet to skip pulling an image if it already exists.
 
   - `agentImage` - Values that configure the Vault Agent sidecar image.
 
     - `repository` (`string: "hashicorp/vault"`) - The name of the Docker image for the Vault Agent sidecar. This should be set to the official Vault Docker image.
 
-    - `tag` (`string: "1.17.2"`) - The tag of the Vault Docker image to use for the Vault Agent Sidecar. **Vault 1.3.1+ is required by the admission controller**.
+    - `tag` (`string: "1.18.1"`) - The tag of the Vault Docker image to use for the Vault Agent Sidecar. **Vault 1.3.1+ is required by the admission controller**.
 
   - `agentDefaults` - Values that configure the injected Vault Agent containers default values.
 
@@ -351,7 +351,7 @@ and consider if they're appropriate for your deployment.
 
     - `repository` (`string: "hashicorp/vault"`) - The name of the Docker image for the containers running Vault.
 
-    - `tag` (`string: "1.17.2"`) - The tag of the Docker image for the containers running Vault. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
+    - `tag` (`string: "1.18.1"`) - The tag of the Docker image for the containers running Vault. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your admission controller.
 
     - `pullPolicy` (`string: "IfNotPresent"`) - The pull policy for container images. The default pull policy is `IfNotPresent` which causes the Kubelet to skip pulling an image if it already exists.
 
@@ -1090,7 +1090,7 @@ and consider if they're appropriate for your deployment.
 
     - `repository` (`string: "hashicorp/vault-csi-provider"`) - The name of the Docker image for the Vault CSI Provider.
 
-    - `tag` (`string: "1.4.3"`) - The tag of the Docker image for the Vault CSI Provider.. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your CSI provider.
+    - `tag` (`string: "1.5.0"`) - The tag of the Docker image for the Vault CSI Provider.. **This should be pinned to a specific version when running in production.** Otherwise, other changes to the chart may inadvertently upgrade your CSI provider.
 
     - `pullPolicy` (`string: "IfNotPresent"`) - The pull policy for container images. The default pull policy is `IfNotPresent` which causes the Kubelet to skip pulling an image if it already exists locally.
 
@@ -1125,6 +1125,9 @@ and consider if they're appropriate for your deployment.
 
   - `hmacSecretName` (`string: ""`) - Override the default secret name for the CSI Provider's HMAC key used for generating secret versions.
 
+  - `hostNetwork` (`bool: false`) - Set the `hostNetwork` parameter on the CSI Provider pods to
+    avoid the need of a dedicated pod ip.
+
   - `daemonSet` - Values that configure the Vault CSI Provider daemonSet.
 
     - `updateStrategy` - Values that configure the Vault CSI Provider update strategy.
@@ -1226,7 +1229,11 @@ and consider if they're appropriate for your deployment.
 
     - `timeoutSeconds` (`int: 3`) - When set to a value, configures the number of seconds after which the probe times out.
 
-  - `debug` (`bool: false`) - When set to true, enables debug logging on the Vault CSI Provider daemonset.
+  - `logLevel` (`string: "info"`) - Configures the log level for the Vault CSI provider. Supported
+    log levels include: `trace`, `debug`, `info`, `warn`, `error`, and `off`.
+
+  - `debug` (`bool: false`) - Deprecated: set `logLevel` to `debug` instead. When set to true,
+    enables debug logging on the Vault CSI Provider daemonset.
 
   - `extraArgs` (`array: []`) - The extra arguments to be applied to the CSI pod startup command. See [here](/vault/docs/platform/k8s/csi/configurations#command-line-arguments) for available flags.
 
@@ -1239,7 +1246,7 @@ and consider if they're appropriate for your deployment.
 
       - `repository` (`string: "hashicorp/vault"`) - The name of the Docker image for the Vault Agent sidecar. This should be set to the official Vault Docker image.
 
-      - `tag` (`string: "1.17.2"`) - The tag of the Vault Docker image to use for the Vault Agent Sidecar.
+      - `tag` (`string: "1.18.1"`) - The tag of the Vault Docker image to use for the Vault Agent Sidecar.
 
     - `logFormat` (`string: "standard"`) -
     - `logLevel` (`string: "info"`) -

website/content/docs/platform/k8s/helm/enterprise.mdx

@@ -33,7 +33,7 @@ In your chart overrides, set the values of [`server.image`](/vault/docs/platform
 server:
   image:
     repository: hashicorp/vault-enterprise
-    tag: 1.17.2-ent
+    tag: 1.18.1-ent
   enterpriseLicense:
     secretName: vault-ent-license
 ```

website/content/docs/platform/k8s/helm/examples/enterprise-dr-with-raft.mdx

@@ -23,7 +23,7 @@ First, create the primary cluster:
 ```shell
 helm install vault-primary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.17.2-ent' \
+  --set='server.image.tag=1.18.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```
@@ -75,7 +75,7 @@ disaster recovery replication.
 ```shell
 helm install vault-secondary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.17.2-ent' \
+  --set='server.image.tag=1.18.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```

website/content/docs/platform/k8s/helm/examples/enterprise-perf-with-raft.mdx

@@ -23,7 +23,7 @@ First, create the primary cluster:
 ```shell
 helm install vault-primary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.17.2-ent' \
+  --set='server.image.tag=1.18.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```
@@ -74,7 +74,7 @@ With the primary cluster created, next create a secondary cluster.
 ```shell
 helm install vault-secondary hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.17.2-ent' \
+  --set='server.image.tag=1.18.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```

website/content/docs/platform/k8s/helm/examples/enterprise-with-raft.mdx

@@ -15,7 +15,7 @@ Integrated Storage (raft) can be enabled using the `server.ha.raft.enabled` valu
 ```shell
 helm install vault hashicorp/vault \
   --set='server.image.repository=hashicorp/vault-enterprise' \
-  --set='server.image.tag=1.17.2-ent' \
+  --set='server.image.tag=1.18.1-ent' \
   --set='server.ha.enabled=true' \
   --set='server.ha.raft.enabled=true'
 ```

website/content/docs/platform/k8s/helm/run.mdx

@@ -409,14 +409,14 @@ Next, list the Helm versions and choose the desired version to install.
 ```bash
 $ helm search repo hashicorp/vault
 NAME           	CHART VERSION	APP VERSION	DESCRIPTION
-hashicorp/vault	0.28.1       	1.17.2     	Official HashiCorp Vault Chart
+hashicorp/vault	0.29.0       	1.18.1     	Official HashiCorp Vault Chart
 ```
 
 Next, test the upgrade with `--dry-run` first to verify the changes sent to the
 Kubernetes cluster.
 
 ```shell-session
-$ helm upgrade vault hashicorp/vault --version=0.28.1 \
+$ helm upgrade vault hashicorp/vault --version=0.29.0 \
     --set='server.image.repository=vault' \
     --set='server.image.tag=123.456' \
     --dry-run

website/content/docs/platform/k8s/injector/annotations.mdx

@@ -28,7 +28,7 @@ them, optional commands to run, etc.
 
 - `vault.hashicorp.com/agent-image` - name of the Vault docker image to use. This
   value overrides the default image configured in the injector and is usually
-  not needed. Defaults to `hashicorp/vault:1.17.2`.
+  not needed. Defaults to `hashicorp/vault:1.18.1`.
 
 - `vault.hashicorp.com/agent-init-first` - configures the pod to run the Vault Agent
   init container first if `true` (last if `false`). This is useful when other init
@@ -55,6 +55,20 @@ them, optional commands to run, etc.
   unique value provided in `vault.hashicorp.com/agent-inject-secret-`. If not provided,
   a default generic template is used.
 
+- `vault.hashicorp.com/agent-template-left-delim` - configures the left delimiter for Vault Agent to
+  use when rendering a secret template. The name of the template is any unique string after
+  `vault.hashicorp.com/agent-template-left-delim-`, such as
+  `vault.hashicorp.com/agent-template-left-delim-foobar`. This should map to the same unique value
+  provided in `vault.hashicorp.com/agent-inject-template-`. If not provided, a default left
+  delimiter is used as defined by [Vault Agent Template Config](/vault/docs/agent-and-proxy/agent/template#left_delimiter).
+
+- `vault.hashicorp.com/agent-template-right-delim` - configures the right delimiter for Vault Agent
+  to use when rendering a secret template. The name of the template is any unique string after
+  `vault.hashicorp.com/agent-template-right-delim-`, such as
+  `vault.hashicorp.com/agent-template-right-delim-foobar`. This should map to the same unique value
+  provided in `vault.hashicorp.com/agent-inject-template-`. If not provided, a default right
+  delimiter is used as defined by [Vault Agent Template Config](/vault/docs/agent-and-proxy/agent/template#right_delimiter).
+
 - `vault.hashicorp.com/error-on-missing-key` - configures whether Vault Agent
   should exit with an error when accessing a struct or map field/key that does
   not exist. The name of the secret is the string after

website/content/partials/helm/install.mdx

@@ -2,16 +2,16 @@
 # List the available releases
 $ helm search repo hashicorp/vault -l
 NAME           	CHART VERSION	APP VERSION	DESCRIPTION
+hashicorp/vault	0.29.0       	1.18.1     	Official HashiCorp Vault Chart
 hashicorp/vault	0.28.1       	1.17.2     	Official HashiCorp Vault Chart
 hashicorp/vault	0.28.0       	1.16.1     	Official HashiCorp Vault Chart
 hashicorp/vault	0.27.0       	1.15.2     	Official HashiCorp Vault Chart
 hashicorp/vault	0.26.1       	1.15.1     	Official HashiCorp Vault Chart
 hashicorp/vault	0.26.0       	1.15.1     	Official HashiCorp Vault Chart
 hashicorp/vault	0.25.0       	1.14.0     	Official HashiCorp Vault Chart
 hashicorp/vault	0.24.0       	1.13.1     	Official HashiCorp Vault Chart
-hashicorp/vault	0.23.0       	1.12.1     	Official HashiCorp Vault Chart
 ...
 
-# Install version 0.28.1
-$ helm install vault hashicorp/vault --version 0.28.1
+# Install version 0.29.0
+$ helm install vault hashicorp/vault --version 0.29.0
 ```

website/content/partials/helm/repo.mdx

@@ -4,5 +4,5 @@ $ helm repo add hashicorp https://helm.releases.hashicorp.com
 
 $ helm search repo hashicorp/vault
 NAME           	CHART VERSION	APP VERSION	DESCRIPTION
-hashicorp/vault	0.28.1       	1.17.2     	Official HashiCorp Vault Chart
+hashicorp/vault	0.29.0       	1.18.1     	Official HashiCorp Vault Chart
 ```