Change storage parameters for new standard

charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml

@@ -51,7 +51,7 @@ spec:
           {{- if .Values.persistence.enabled }}
           volumeMounts:
           - mountPath: "/mnt/mqm"
-            name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
+            name: "{{ template "fullname" . }}-{{ .Values.dataPVC.name }}"
           {{- end }}
           # Set liveness probe to determine if the queue manager is running
           livenessProbe:
@@ -67,7 +67,7 @@ spec:
             exec:
               command:
               - chkmqready
-            initialDelaySeconds: 5
+            initialDelaySeconds: 10
             periodSeconds: 5
             timeoutSeconds: 3
             failureThreshold: 1
@@ -79,18 +79,25 @@ spec:
   volumeClaimTemplates:
   {{- if .Values.persistence.enabled }}
   - metadata:
-      name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
+      name: "{{ template "fullname" . }}-{{ .Values.dataPVC.name }}"
       labels:
         app: {{ template "fullname" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
         heritage: "{{ .Release.Service }}"
     spec:
-      {{- if .Values.persistence.storageClassName }}
-      storageClassName: {{ .Values.persistence.storageClassName | quote }}
+      {{- if .Values.persistence.useDynamicProvisioning }}
+      ## If present, use the storageClassName from the values.yaml, else use the
+      ## default storageClass setup by Kubernetes Administrator
+      ##
+      ## Setting storageClassName to nil means use the default storage class
+      storageClassName: {{ default nil .Values.dataPVC.storageClassName | quote }}
+      {{- else }}
+      ## Disable dynamic provisioning
+      storageClassName: ""
       {{- end }}
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: {{ .Values.persistence.size | quote }}
+          storage: {{ .Values.dataPVC.size | quote }}
   {{- end }}