fix: correct storageClass handling for geodata persistence (#1524)

sentry-kubernetes · Oct 8, 2024 · b2f568d · b2f568d
1 parent 6beaa85
commit b2f568d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/charts/sentry/README.md b/charts/sentry/README.md
@@ -1207,14 +1207,11 @@ geodata:
   licenseKey: "example"
   editionIDs: "example"
   persistence:
-    ## database data Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
     ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
     ##   GKE, AWS & OpenStack)
-    ##
-    # storageClass: "-"
+    # storageClass: ""
     size: 1Gi
   volumeName: "data-sentry-geoip"
   # mountPath of the volume containing the database

diff --git a/charts/sentry/templates/pvc-geoip.yaml b/charts/sentry/templates/pvc-geoip.yaml
@@ -14,9 +14,7 @@ spec:
   resources:
     requests:
       storage: {{ .Values.geodata.persistence.size }}
-{{- if (eq "-" .Values.geodata.persistence.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.geodata.persistence.storageClass }}"
-  {{- end }}
+{{- if .Values.geodata.persistence.storageClass }}
+  storageClassName: {{ .Values.geodata.persistence.storageClass | quote }}
+{{- end }}
 {{- end }}
diff --git a/charts/sentry/values.yaml b/charts/sentry/values.yaml
@@ -161,13 +161,10 @@ geodata:
   licenseKey: ""
   editionIDs: ""
   persistence:
-    ## database data Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
-    ## If set to "-", storageClassName: "", which disables dynamic provisioning
     ## If undefined (the default) or set to null, no storageClassName spec is
     ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
     ##   GKE, AWS & OpenStack)
-    ##
     # storageClass: "-"
     size: 1Gi
   volumeName: ""