Update example configurations to use a persistent KeyManager #5197

Signed-off-by: Matteus Silva <matteus.sthefano.ls@gmail.com>
spiffe · Jun 23, 2024 · ad3a3b0 · ad3a3b0
1 parent f6bf876
commit ad3a3b0
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 10 deletions.
diff --git a/examples/k8s/advanced/spire-chart/templates/agent-configmap.tpl b/examples/k8s/advanced/spire-chart/templates/agent-configmap.tpl
@@ -21,8 +21,9 @@ data:
           cluster = "{{ .Values.clustername }}"
         }
       }
-      KeyManager "memory" {
-        plugin_data {
+      KeyManager "disk" {
+        plugin_data = {
+          directory = "/run/spire"
         }
       }
       WorkloadAttestor "k8s" {

diff --git a/examples/k8s/advanced/spire-chart/templates/agent-daemonset.tpl b/examples/k8s/advanced/spire-chart/templates/agent-daemonset.tpl
@@ -42,6 +42,9 @@ spec:
             - name: spire-agent-socket
               mountPath: /run/spire/sockets
               readOnly: false
+            - name: spire-agent-data
+              mountPath: /run/spire
+              readOnly: false
             - name: spire-bundle
               mountPath: /run/spire/bundle
               readOnly: true
@@ -72,6 +75,10 @@ spec:
           hostPath:
             path: /run/spire/sockets
             type: DirectoryOrCreate
+        - name: spire-agent-data
+          hostPath:
+            path: /run/spire
+            type: DirectoryOrCreate
         - name: spire-agent-token
           projected:
             sources:

diff --git a/examples/k8s/eks_sat/spire-agent.yaml b/examples/k8s/eks_sat/spire-agent.yaml
@@ -58,8 +58,9 @@ data:
         }
       }
 
-      KeyManager "memory" {
-        plugin_data {
+      KeyManager "disk" {
+        plugin_data = {
+          directory = "/run/spire"
         }
       }
 
@@ -144,6 +145,9 @@ spec:
             - name: spire-agent-socket
               mountPath: /run/spire/sockets
               readOnly: false
+            - name: spire-agent-data
+              mountPath: /run/spire
+              readOnly: false
           livenessProbe:
             httpGet:
               path: /live
@@ -166,3 +170,7 @@ spec:
           hostPath:
             path: /run/spire/sockets
             type: DirectoryOrCreate
+        - name: spire-agent-data
+          hostPath:
+            path: /run/spire
+            type: DirectoryOrCreate
diff --git a/examples/k8s/postgres/spire-agent.yaml b/examples/k8s/postgres/spire-agent.yaml
@@ -30,8 +30,9 @@ data:
         }
       }
 
-      KeyManager "memory" {
-        plugin_data {
+      KeyManager "disk" {
+        plugin_data = {
+          directory = "/run/spire"
         }
       }
 
@@ -120,6 +121,9 @@ spec:
             - name: spire-agent-socket
               mountPath: /run/spire/sockets
               readOnly: false
+            - name: spire-agent-data
+              mountPath: /run/spire
+              readOnly: false
           livenessProbe:
             httpGet:
               path: /live
@@ -142,3 +146,7 @@ spec:
           hostPath:
             path: /run/spire/sockets
             type: DirectoryOrCreate
+        - name: spire-agent-data
+          hostPath:
+            path: /run/spire
+            type: DirectoryOrCreate
diff --git a/examples/k8s/simple_psat/spire-agent.yaml b/examples/k8s/simple_psat/spire-agent.yaml
@@ -58,8 +58,9 @@ data:
         }
       }
 
-      KeyManager "memory" {
-        plugin_data {
+      KeyManager "disk" {
+        plugin_data = {
+          directory = "/run/spire"
         }
       }
 
@@ -148,6 +149,9 @@ spec:
             - name: spire-agent-socket
               mountPath: /run/spire/sockets
               readOnly: false
+            - name: spire-agent-data
+              mountPath: /run/spire
+              readOnly: false
             - name: spire-token
               mountPath: /var/run/secrets/tokens
           livenessProbe:
@@ -172,6 +176,10 @@ spec:
           hostPath:
             path: /run/spire/sockets
             type: DirectoryOrCreate
+        - name: spire-agent-data
+          hostPath:
+            path: /run/spire
+            type: DirectoryOrCreate
         - name: spire-token
           projected:
             sources:

diff --git a/examples/k8s/simple_sat/spire-agent.yaml b/examples/k8s/simple_sat/spire-agent.yaml
@@ -30,8 +30,9 @@ data:
         }
       }
 
-      KeyManager "memory" {
-        plugin_data {
+      KeyManager "disk" {
+        plugin_data = {
+          directory = "/run/spire"
         }
       }
 
@@ -120,6 +121,9 @@ spec:
             - name: spire-agent-socket
               mountPath: /run/spire/sockets
               readOnly: false
+            - name: spire-agent-data
+              mountPath: /run/spire
+              readOnly: false
           livenessProbe:
             httpGet:
               path: /live
@@ -142,3 +146,7 @@ spec:
           hostPath:
             path: /run/spire/sockets
             type: DirectoryOrCreate
+        - name: spire-agent-data
+          hostPath:
+            path: /run/spire
+            type: DirectoryOrCreate