Skip to content

Commit 2df3cb5

Browse files
committed
Resolve conflicts
1 parent 8848668 commit 2df3cb5

File tree

4 files changed

+27
-474
lines changed

4 files changed

+27
-474
lines changed

website/content/docs/agent/caching/persistent-caches/index.mdx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
layout: docs
33
page_title: Vault Agent Persistent Cache Types
4-
sidebar_title: Persistent Cache
54
description: Persistent Cache Types for Vault Agent Caching
65
---
76

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
---
22
layout: docs
33
page_title: Kubernetes - Vault Agent Persistent Cache
4-
sidebar_title: Kubernetes
54
description: Kubernetes Persistent Cache for Vault Agent Caching
65
---
76

87
# Vault Agent Kubernetes Persistent Cache
98

10-
When `kubernetes` is configured for the persistent cache type, Vault Agent will optimize the
11-
persistent cache specifically for Kubernetes. This type of persistent cache requires a Kubernetes
12-
service account token. The service account token is used during encryption and decryption of the
9+
When `kubernetes` is configured for the persistent cache type, Vault Agent will optimize the
10+
persistent cache specifically for Kubernetes. This type of persistent cache requires a Kubernetes
11+
service account token. The service account token is used during encryption and decryption of the
1312
persistent cache as an additional integrity check.
1413

15-
The Vault Agent persistent cache file in Kubernetes should only be used for handing off Vault tokens
16-
and leases between initialization and sidecar Vault Agent containers. This cache file should be shared
14+
The Vault Agent persistent cache file in Kubernetes should only be used for handing off Vault tokens
15+
and leases between initialization and sidecar Vault Agent containers. This cache file should be shared
1716
using a memory volume between the Vault Agent containers.
1817

19-
If the Vault Agent Injector for Kubernetes is being used, the persistent cache is automatically configured
18+
If the Vault Agent Injector for Kubernetes is being used, the persistent cache is automatically configured
2019
and used if the annotation [`vault.hashicorp.com/agent-cache-enable: true`](/docs/platform/k8s/injector/annotations#vault-hashicorp-com-agent-cache-enable) is set.
2120

2221
## Configuration
2322

24-
- `service_account_token_file` `(string: optional)` - When type is set to `kubernetes`,
25-
this configures the path on disk where the Kubernetes service account token can be found.
23+
- `service_account_token_file` `(string: optional)` - When type is set to `kubernetes`,
24+
this configures the path on disk where the Kubernetes service account token can be found.
2625
Defaults to `/var/run/secrets/kubernetes.io/serviceaccount/token`.

website/data/docs-nav-data.json

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,25 @@
765765
},
766766
{
767767
"title": "Caching",
768-
"path": "agent/caching"
768+
"routes": [
769+
{
770+
"title": "Overview",
771+
"path": "agent/caching"
772+
},
773+
{
774+
"title": "Persistent Caching",
775+
"routes": [
776+
{
777+
"title": "Overview",
778+
"path": "agent/caching/persistent-caches"
779+
},
780+
{
781+
"title": "Kubernetes",
782+
"path": "agent/caching/persistent-caches/kubernetes"
783+
}
784+
]
785+
}
786+
]
769787
},
770788
{
771789
"title": "Templates",

0 commit comments

Comments
 (0)