academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix Helm Chart bugs

Browse Source
This commit is contained in:
Rob Parker
2017-09-15 16:43:13 +01:00
parent 528cc0e504
commit cc4907dc72
6 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
charts/ibm-mqadvanced-server-dev/README.md
View File

@@ -50,8 +50,8 @@ The following table lists the configurable parameters of the `ibm-mqadvanced-ser
| `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecret` | Image pull secret, if you are using a private Docker registry | `nil` | | `image.pullSecret` | Image pull secret, if you are using a private Docker registry | `nil` |
| `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` | | `persistence.storageClass` | Storage class of backing Persistent Volume | `nil` |
| `data.persistence.size` | Size of data volume | `2Gi` | | `persistence.size` | Size of data volume | `2Gi` |
| `service.name` | Name of the Kubernetes service to create | `qmgr` | | `service.name` | Name of the Kubernetes service to create | `qmgr` |
| `service.type` | Kubernetes service type exposing ports, e.g. `NodePort` | `ClusterIP` | | `service.type` | Kubernetes service type exposing ports, e.g. `NodePort` | `ClusterIP` |
| `resources.limits.cpu` | Kubernetes CPU limit for the Queue Manager container | `500m` | | `resources.limits.cpu` | Kubernetes CPU limit for the Queue Manager container | `500m` |

10
charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml
View File

@@ -66,7 +66,7 @@ spec:
{{- if .Values.persistence.enabled }} {{- if .Values.persistence.enabled }}
volumeMounts: volumeMounts:
- mountPath: "/mnt/mqm" - mountPath: "/mnt/mqm"
name: {{ template "fullname" . }}-{{ .Values.data.name }} name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
{{- end }} {{- end }}
resources: resources:
limits: limits:
@@ -76,18 +76,18 @@ spec:
volumeClaimTemplates: volumeClaimTemplates:
{{- if .Values.persistence.enabled }} {{- if .Values.persistence.enabled }}
- metadata: - metadata:
name: {{ template "fullname" . }}-{{ .Values.data.name }} name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
labels: labels:
app: {{ template "fullname" . }} app: {{ template "fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}" release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}" heritage: "{{ .Release.Service }}"
spec: spec:
{{- if .Values.data.persistence.storageClassName }} {{- if .Values.persistence.storageClassName }}
storageClassName: {{ .Values.data.persistence.storageClassName | quote }} storageClassName: {{ .Values.persistence.storageClassName | quote }}
{{- end }} {{- end }}
accessModes: [ "ReadWriteOnce" ] accessModes: [ "ReadWriteOnce" ]
resources: resources:
requests: requests:
storage: {{ .Values.data.persistence.size | quote }} storage: {{ .Values.persistence.size | quote }}
{{- end }} {{- end }}

9
charts/ibm-mqadvanced-server-dev/values.yaml
View File

@@ -26,13 +26,12 @@ image:
# data section specifies settings for the main persistent volume claim, which is used for data in /var/mqm # data section specifies settings for the main persistent volume claim, which is used for data in /var/mqm
persistence: persistence:
enabled: true enabled: true
data:
# name sets part of the name for this persistent volume claim # name sets part of the name for this persistent volume claim
name: "data" name: "data"
## storageClassName is the name of the storage class to use, or an empty string for no storage class ## storageClassName is the name of the storage class to use, or an empty string for no storage class
storageClassName: "" storageClassName: ""
## size is the minimum size of the persistent volume ## size is the minimum size of the persistent volume
size: 2Gi size: 2Gi
service: service:
name: qmgr name: qmgr
type: ClusterIP type: ClusterIP

4
charts/ibm-mqadvanced-server-prod/README.md
View File

@@ -50,8 +50,8 @@ The following table lists the configurable parameters of the `ibm-mqadvanced-ser
| `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecret` | Image pull secret, if you are using a private Docker registry | `nil` | | `image.pullSecret` | Image pull secret, if you are using a private Docker registry | `nil` |
| `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` | | `persistence.storageClass` | Storage class of backing Persistent Volume | `nil` |
| `data.persistence.size` | Size of data volume | `2Gi` | | `persistence.size` | Size of data volume | `2Gi` |
| `service.name` | Name of the Kubernetes service to create | `qmgr` | | `service.name` | Name of the Kubernetes service to create | `qmgr` |
| `service.type` | Kubernetes service type exposing ports, e.g. `NodePort` | `ClusterIP` | | `service.type` | Kubernetes service type exposing ports, e.g. `NodePort` | `ClusterIP` |
| `resources.limits.cpu` | Kubernetes CPU limit for the Queue Manager container | `1` | | `resources.limits.cpu` | Kubernetes CPU limit for the Queue Manager container | `1` |

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

@@ -51,7 +51,7 @@ spec:
{{- if .Values.persistence.enabled }} {{- if .Values.persistence.enabled }}
volumeMounts: volumeMounts:
- mountPath: "/mnt/mqm" - mountPath: "/mnt/mqm"
name: {{ template "fullname" . }}-{{ .Values.data.name }} name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
{{- end }} {{- end }}
# Set liveness probe to determine if the queue manager is running # Set liveness probe to determine if the queue manager is running
livenessProbe: livenessProbe:
@@ -79,18 +79,18 @@ spec:
volumeClaimTemplates: volumeClaimTemplates:
{{- if .Values.persistence.enabled }} {{- if .Values.persistence.enabled }}
- metadata: - metadata:
name: {{ template "fullname" . }}-{{ .Values.data.name }} name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
labels: labels:
app: {{ template "fullname" . }} app: {{ template "fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}" release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}" heritage: "{{ .Release.Service }}"
spec: spec:
{{- if .Values.data.persistence.storageClassName }} {{- if .Values.persistence.storageClassName }}
storageClassName: {{ .Values.data.persistence.storageClassName | quote }} storageClassName: {{ .Values.persistence.storageClassName | quote }}
{{- end }} {{- end }}
accessModes: [ "ReadWriteOnce" ] accessModes: [ "ReadWriteOnce" ]
resources: resources:
requests: requests:
storage: {{ .Values.data.persistence.size | quote }} storage: {{ .Values.persistence.size | quote }}
{{- end }} {{- end }}

13
charts/ibm-mqadvanced-server-prod/values.yaml
View File

@@ -23,18 +23,15 @@ image:
pullSecret: pullSecret:
# pullPolicy is either IfNotPresent or Always (https://kubernetes.io/docs/concepts/containers/images/) # pullPolicy is either IfNotPresent or Always (https://kubernetes.io/docs/concepts/containers/images/)
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
# data section specifies settings for the main persistent volume claim, which is used for data in /var/mqm # persistence section specifies settings for the main persistent volume claim, which is used for data in /var/mqm
persistence: persistence:
enabled: true enabled: true
data:
# name sets part of the name for this persistent volume claim # name sets part of the name for this persistent volume claim
name: "data" name: "data"
persistence: ## storageClassName is the name of the storage class to use, or an empty string for no storage class
enabled: true storageClassName: ""
## storageClassName is the name of the storage class to use, or an empty string for no storage class ## size is the minimum size of the persistent volume
storageClassName: "" size: 2Gi
## size is the minimum size of the persistent volume
size: 2Gi
service: service:
name: qmgr name: qmgr
type: ClusterIP type: ClusterIP