From 5489212bb546aa35e96879fa7b655d59347c3ef6 Mon Sep 17 00:00:00 2001
From: Faisal Memon <fymemon@yahoo.com>
Date: Fri, 12 May 2023 07:19:50 -0700
Subject: [PATCH] Remove persistence.enabled flag (#274)

---
 charts/spire/charts/spire-server/README.md                  | 1 -
 charts/spire/charts/spire-server/templates/statefulset.yaml | 4 ----
 charts/spire/charts/spire-server/values.yaml                | 2 --
 3 files changed, 7 deletions(-)

diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md
index aa6b806..ae28a4f 100644
--- a/charts/spire/charts/spire-server/README.md
+++ b/charts/spire/charts/spire-server/README.md
@@ -87,7 +87,6 @@ A Helm chart to install the SPIRE server.
 | 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` | Enable persistence used by sqlite3 for spire-server, by the disk KeyStore, and/or by Tornjak. |
 | persistence.size | string | `"1Gi"` |  |
 | persistence.storageClass | string | `nil` |  |
 | podAnnotations | object | `{}` |  |
diff --git a/charts/spire/charts/spire-server/templates/statefulset.yaml b/charts/spire/charts/spire-server/templates/statefulset.yaml
index c44a3d3..f9e6262 100644
--- a/charts/spire/charts/spire-server/templates/statefulset.yaml
+++ b/charts/spire/charts/spire-server/templates/statefulset.yaml
@@ -104,11 +104,9 @@ spec:
             - name: spire-config
               mountPath: /run/spire/config
               readOnly: true
-            {{- if eq (.Values.persistence.enabled | toString) "true" }}
             - name: spire-data
               mountPath: /run/spire/data
               readOnly: false
-            {{- end }}
             {{- if eq (.Values.upstreamAuthority.disk.enabled | toString) "true" }}
             - name: upstream-ca
               mountPath: /run/spire/upstream_ca
@@ -198,7 +196,6 @@ spec:
         {{- toYaml .Values.extraVolumes | nindent 8 }}
         {{- end }}
   volumeClaimTemplates:
-    {{- if eq (.Values.persistence.enabled | toString) "true" }}
     - metadata:
         name: spire-data
       spec:
@@ -210,4 +207,3 @@ spec:
         {{- 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 41cdfd4..bbf2e0d 100644
--- a/charts/spire/charts/spire-server/values.yaml
+++ b/charts/spire/charts/spire-server/values.yaml
@@ -78,8 +78,6 @@ affinity: {}
 topologySpreadConstraints: []
 
 persistence:
-  # -- Enable persistence used by sqlite3 for spire-server, by the disk KeyStore, and/or by Tornjak.
-  enabled: true
   size: 1Gi
   accessMode: ReadWriteOnce
   storageClass: null