diff --git a/charts/ibm-mqadvanced-server-dev/README.md b/charts/ibm-mqadvanced-server-dev/README.md index 206f703..e0c671d 100644 --- a/charts/ibm-mqadvanced-server-dev/README.md +++ b/charts/ibm-mqadvanced-server-dev/README.md @@ -49,7 +49,7 @@ The following table lists the configurable parameters of the `ibm-mqadvanced-ser | `image.tag` | Image tag | `9` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecret` | Image pull secret, if you are using a private Docker registry | `nil` | -| `data.persistence.enabled` | Use a PersistentVolume to persist MQ data (under `/var/mqm`) | `true` | +| `persistence.enabled` | Use a PersistentVolume to persist MQ data (under `/var/mqm`) | `true` | | `data.persistence.storageClass` | Storage class of backing Persistent Volume | `nil` | | `data.persistence.size` | Size of data volume | `2Gi` | | `service.name` | Name of the Kubernetes service to create | `qmgr` | diff --git a/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml b/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml index fdb8dce..929a0a3 100644 --- a/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml +++ b/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml @@ -40,7 +40,7 @@ spec: containers: - name: qmgr image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} + imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - containerPort: 1414 - containerPort: 9443 @@ -63,7 +63,7 @@ spec: name: {{ template "fullname" . }} key: appPassword {{- end }} - {{- if .Values.data.persistence.enabled }} + {{- if .Values.persistence.enabled }} volumeMounts: - mountPath: "/mnt/mqm" name: {{ template "fullname" . }}-{{ .Values.data.name }} @@ -74,7 +74,7 @@ spec: requests: {{ toYaml .Values.resources.requests | indent 14 }} volumeClaimTemplates: - {{- if .Values.data.persistence.enabled }} + {{- if .Values.persistence.enabled }} - metadata: name: {{ template "fullname" . }}-{{ .Values.data.name }} labels: @@ -89,5 +89,5 @@ spec: accessModes: [ "ReadWriteOnce" ] resources: requests: - storage: {{ .Values.data.persistence.size | quote }} + storage: {{ .Values.data.persistence.size | quote }} {{- end }} diff --git a/charts/ibm-mqadvanced-server-dev/values.yaml b/charts/ibm-mqadvanced-server-dev/values.yaml index 7dd02fd..ed9ed03 100644 --- a/charts/ibm-mqadvanced-server-dev/values.yaml +++ b/charts/ibm-mqadvanced-server-dev/values.yaml @@ -19,16 +19,16 @@ image: repository: ibmcom/mq # tag is the tag to use for the container repository tag: 9 - # pullSecret is the secret to use when pulling the image from a private registry + # pullSecret is the secret to use when pulling the image from a private registry pullSecret: # pullPolicy is either IfNotPresent or Always (https://kubernetes.io/docs/concepts/containers/images/) pullPolicy: IfNotPresent # data section specifies settings for the main persistent volume claim, which is used for data in /var/mqm +persistence: + enabled: true data: # name sets part of the name for this persistent volume claim name: "data" - persistence: - enabled: true ## storageClassName is the name of the storage class to use, or an empty string for no storage class storageClassName: "" ## size is the minimum size of the persistent volume @@ -54,4 +54,4 @@ queueManager: # appPassword sets the password of the app user appPassword: # nameOverride can be set to partially override the name of the resources created by this chart -nameOverride: \ No newline at end of file +nameOverride: diff --git a/charts/ibm-mqadvanced-server-prod/README.md b/charts/ibm-mqadvanced-server-prod/README.md index e6b4b80..13091e2 100644 --- a/charts/ibm-mqadvanced-server-prod/README.md +++ b/charts/ibm-mqadvanced-server-prod/README.md @@ -49,7 +49,7 @@ The following table lists the configurable parameters of the `ibm-mqadvanced-ser | `image.tag` | Image tag | `nil` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecret` | Image pull secret, if you are using a private Docker registry | `nil` | -| `data.persistence.enabled` | Use a PersistentVolume to persist MQ data (under `/var/mqm`) | `true` | +| `persistence.enabled` | Use a PersistentVolume to persist MQ data (under `/var/mqm`) | `true` | | `data.persistence.storageClass` | Storage class of backing Persistent Volume | `nil` | | `data.persistence.size` | Size of data volume | `2Gi` | | `service.name` | Name of the Kubernetes service to create | `qmgr` | diff --git a/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml b/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml index 2c3ab31..708a01a 100644 --- a/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml +++ b/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml @@ -48,7 +48,7 @@ spec: value: {{ .Values.license }} - name: MQ_QMGR_NAME value: {{ .Values.queueManager.name | default .Release.Name | replace "-" "" }} - {{- if .Values.data.persistence.enabled }} + {{- if .Values.persistence.enabled }} volumeMounts: - mountPath: "/mnt/mqm" name: {{ template "fullname" . }}-{{ .Values.data.name }} @@ -77,7 +77,7 @@ spec: requests: {{ toYaml .Values.resources.requests | indent 14 }} volumeClaimTemplates: - {{- if .Values.data.persistence.enabled }} + {{- if .Values.persistence.enabled }} - metadata: name: {{ template "fullname" . }}-{{ .Values.data.name }} labels: diff --git a/charts/ibm-mqadvanced-server-prod/values.yaml b/charts/ibm-mqadvanced-server-prod/values.yaml index ecc2203..54e89c0 100644 --- a/charts/ibm-mqadvanced-server-prod/values.yaml +++ b/charts/ibm-mqadvanced-server-prod/values.yaml @@ -24,6 +24,8 @@ image: # pullPolicy is either IfNotPresent or Always (https://kubernetes.io/docs/concepts/containers/images/) pullPolicy: IfNotPresent # data section specifies settings for the main persistent volume claim, which is used for data in /var/mqm +persistence: + enabled: true data: # name sets part of the name for this persistent volume claim name: "data"