fix: pvcs not picking up custom aws sc

- fix: double quoting when getting the storageClassName from helper dict
- fix: custom names for volumeClaimTemplates makes the MCK operator not pick up the custom StorageClass: mongodb/mongodb-kubernetes-operator#177
- add: helm hooks to aws-gp3 storage class resource to guarantee its existence before any other resources are created

Author: monrax

graylog/templates/_helpers.tpl

@@ -280,7 +280,7 @@ Provider-defined Storage Class name
 {{- $names := dict }}
 {{- $_ := include "graylog.fullname" . | printf "%s-gp3" | set $names "aws" -}}
 {{/* add more entries here */}}
-{{- .Values.provider | default "" | quote | get $names }}
+{{- .Values.provider | default "" | get $names }}
 {{- end }}
 
 {{/*

graylog/templates/config/sc/aws-gp3.yaml

@@ -3,6 +3,9 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: {{ include "graylog.provider.storageClassName" . }}
+  annotations:
+    "helm.sh/hook": pre-install,pre-upgrade
+    "helm.sh/hook-weight": "-10"
 provisioner: ebs.csi.aws.com
 parameters:
   type: gp3

graylog/templates/custom/mongo-rs.yaml

@@ -50,7 +50,7 @@ spec:
           serviceAccountName: {{ include "graylog.mongodb.serviceAccountName" . }}
       volumeClaimTemplates:
         - metadata:
-            name: mongodb-data-vol
+            name: data-volume
           spec:
             accessModes: ["ReadWriteOnce"]
             {{- with (include "graylog.mongodb.storageClassName" .) }}
@@ -60,13 +60,13 @@ spec:
               requests:
                 storage: {{ .Values.mongodb.persistence.size.data | default "10G" | quote }}
         - metadata:
-            name: mongodb-logs-vol
+            name: logs-volume
           spec:
             accessModes: [ "ReadWriteOnce" ]
             {{- with (include "graylog.mongodb.storageClassName" .) }}
             storageClassName: {{ . | quote }}
             {{- end }}
             resources:
               requests:
-                storage: {{ .Values.mongodb.persistence.size.data | default "2G" | quote }}
+                storage: {{ .Values.mongodb.persistence.size.logs | default "2G" | quote }}
 {{- end }}