From 0dec80e1d52fb32fccf832c89b7391e906823d61 Mon Sep 17 00:00:00 2001
From: kfox1111 <Kevin.Fox@pnnl.gov>
Date: Wed, 12 Apr 2023 08:56:10 -0700
Subject: [PATCH] Switch to persistence (#200)

This patch switches the value to persistence to follow the helm
convention.

fixes: https://github.com/spiffe/helm-charts/issues/199

Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
---
 charts/spire/charts/spire-server/README.md           |  8 ++++----
 .../charts/spire-server/templates/statefulset.yaml   | 12 ++++++------
 charts/spire/charts/spire-server/values.yaml         |  2 +-
 examples/production/values.yaml                      |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md
index 8a6abd7..31b5660 100644
--- a/charts/spire/charts/spire-server/README.md
+++ b/charts/spire/charts/spire-server/README.md
@@ -53,10 +53,6 @@ A Helm chart to install the SPIRE server.
 | controllerManager.validatingWebhookConfiguration.upgradeHook.image.registry | string | `"cgr.dev"` |  |
 | controllerManager.validatingWebhookConfiguration.upgradeHook.image.repository | string | `"chainguard/kubectl"` |  |
 | controllerManager.validatingWebhookConfiguration.upgradeHook.image.version | string | `"latest"` |  |
-| dataStorage.accessMode | string | `"ReadWriteOnce"` |  |
-| dataStorage.enabled | bool | `true` |  |
-| dataStorage.size | string | `"1Gi"` |  |
-| dataStorage.storageClass | string | `nil` |  |
 | defaultJwtSvidTTL | string | `"1h"` |  |
 | defaultX509SvidTTL | string | `"4h"` |  |
 | extraContainers | list | `[]` |  |
@@ -80,6 +76,10 @@ A Helm chart to install the SPIRE server.
 | nodeAttestor.k8sPsat.serviceAccountAllowList | list | `[]` |  |
 | nodeSelector | object | `{}` |  |
 | notifier.k8sbundle.namespace | string | `""` | Namespace to push the bundle into, if blank will default to SPIRE Server namespace |
+| persistence.accessMode | string | `"ReadWriteOnce"` |  |
+| persistence.enabled | bool | `true` |  |
+| persistence.size | string | `"1Gi"` |  |
+| persistence.storageClass | string | `nil` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
 | replicaCount | int | `1` | SPIRE server currently runs with a sqlite database. Scaling to multiple instances will not work until we use an external database. |
diff --git a/charts/spire/charts/spire-server/templates/statefulset.yaml b/charts/spire/charts/spire-server/templates/statefulset.yaml
index 2773bf6..9d57a82 100644
--- a/charts/spire/charts/spire-server/templates/statefulset.yaml
+++ b/charts/spire/charts/spire-server/templates/statefulset.yaml
@@ -91,7 +91,7 @@ spec:
             - name: spire-config
               mountPath: /run/spire/config
               readOnly: true
-            {{- if eq (.Values.dataStorage.enabled | toString) "true" }}
+            {{- if eq (.Values.persistence.enabled | toString) "true" }}
             - name: spire-data
               mountPath: /run/spire/data
               readOnly: false
@@ -185,16 +185,16 @@ spec:
         {{- toYaml .Values.extraVolumes | nindent 8 }}
         {{- end }}
   volumeClaimTemplates:
-    {{- if eq (.Values.dataStorage.enabled | toString) "true" }}
+    {{- if eq (.Values.persistence.enabled | toString) "true" }}
     - metadata:
         name: spire-data
       spec:
         accessModes:
-          - {{ .Values.dataStorage.accessMode | default "ReadWriteOnce" }}
+          - {{ .Values.persistence.accessMode | default "ReadWriteOnce" }}
         resources:
           requests:
-            storage: {{ .Values.dataStorage.size }}
-        {{- if .Values.dataStorage.storageClass }}
-        storageClassName: {{ .Values.dataStorage.storageClass }}
+            storage: {{ .Values.persistence.size }}
+        {{- if .Values.persistence.storageClass }}
+        storageClassName: {{ .Values.persistence.storageClass }}
         {{- end }}
     {{ end }}
diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml
index 4206c66..277663f 100644
--- a/charts/spire/charts/spire-server/values.yaml
+++ b/charts/spire/charts/spire-server/values.yaml
@@ -73,7 +73,7 @@ affinity: {}
 
 topologySpreadConstraints: []
 
-dataStorage:
+persistence:
   enabled: true
   size: 1Gi
   accessMode: ReadWriteOnce
diff --git a/examples/production/values.yaml b/examples/production/values.yaml
index d81d285..1524723 100644
--- a/examples/production/values.yaml
+++ b/examples/production/values.yaml
@@ -24,7 +24,7 @@ spire-server:
     seccompProfile:
       type: RuntimeDefault
 
-  dataStorage:
+  persistence:
     enabled: true
 
   logLevel: info