Merge pull request #110 from vgavinash/patch-1

Update to 9.4.1.0

Author: callumpjackson

README.md

@@ -1,5 +1,5 @@
 # IBM MQ Sample Helm Chart
-This repository provides a helm chart to deploy an IBM® MQ container built from the [IBM MQ Container GitHub repository](https://github.com/ibm-messaging/mq-container), and has been verified against the [9.4.0 branch](https://github.com/ibm-messaging/mq-container/tree/9.4.0).
+This repository provides a helm chart to deploy an IBM® MQ container built from the [IBM MQ Container GitHub repository](https://github.com/ibm-messaging/mq-container), and has been verified against the [9.4.1 branch](https://github.com/ibm-messaging/mq-container/tree/9.4.1).
 
 ## Pre-reqs
 Prior to using the Helm chart you will need to install two dependencies:

charts/ibm-mq/Chart.yaml

@@ -14,9 +14,9 @@
 apiVersion: v2
 name: ibm-mq
 description: IBM MQ queue manager
-version: 10.1.1
+version: 11.0.0
 type: application
-appVersion: 9.4.0.0
+appVersion: 9.4.1.0
 kubeVersion: ">=1.18.0-0"
 keywords:
   - IBM MQ

charts/ibm-mq/README.md

@@ -4,7 +4,7 @@
 
 ## Introduction
 
-This chart deploys a single IBM® MQ server (Queue Manager) built from the [IBM MQ Container GitHub repository](https://github.com/ibm-messaging/mq-container), and has been verified using the [9.4.0 branch](https://github.com/ibm-messaging/mq-container/tree/9.4.0). IBM MQ is messaging middleware that simplifies and accelerates the integration of diverse applications and business data across multiple platforms.  It uses message queues, topics and subscriptions to facilitate the exchanges of information and offers a single messaging solution for cloud and on-premises environments.
+This chart deploys a single IBM® MQ server (Queue Manager) built from the [IBM MQ Container GitHub repository](https://github.com/ibm-messaging/mq-container), and has been verified using the [9.4.1 branch](https://github.com/ibm-messaging/mq-container/tree/9.4.1). IBM MQ is messaging middleware that simplifies and accelerates the integration of diverse applications and business data across multiple platforms.  It uses message queues, topics and subscriptions to facilitate the exchanges of information and offers a single messaging solution for cloud and on-premises environments.
 
 ## Chart Details
 
@@ -106,7 +106,7 @@ Alternatively, each parameter can be specified by using the `--set key=value[,ke
 | ------------------------------- | --------------------------------------------------------------- | ------------------------------------------ |
 | `license`                       | Set to `accept` to accept the terms of the IBM license          | `"not accepted"`                           |
 | `image.repository`              | Image full name including repository                            | `ibmcom/mq`                                |
-| `image.tag`                     | Image tag                                                       | `9.4.0.0-r3`                               |
+| `image.tag`                     | Image tag                                                       | `9.4.1.0-r1`                               |
 | `image.pullPolicy`              | Setting that controls when the kubelet attempts to pull the specified image.                                               | `IfNotPresent`                             |
 | `image.pullSecret`              | An optional list of references to secrets in the same namespace to use for pulling any of the images used by this QueueManager. If specified, these secrets will be passed to individual puller implementations for them to use. For example, in the case of docker, only DockerConfig type secrets are honoured. For more information, see [here](https://kubernetes.io/docs/concepts/containers/images#specifying-imagepullsecrets-on-a-pod)   | `nil`                                      |
 | `credentials.enable`            | Enable MQ to utilize credentials from a Secret for the default "app" and "admin" users. MQ no longer sets a default password for these users, so it is highly recommended to set your own by creating a Secret.    | `false`      |

charts/ibm-mq/templates/stateful-set.yaml

@@ -26,6 +26,9 @@ spec:
     matchLabels:
 {{- include "ibm-mq.selectorLabels" . | nindent 6 }}
   serviceName: qm
+  {{- if and (.Values.queueManager.nativeha.enable) (.Values.queueManager.multiinstance.enable) }}
+    {{- fail "Error: Both nativeha and multiinstance flags should not be enabled simultaneously" }}
+  {{- end }}
   {{- if .Values.queueManager.nativeha.enable }}
   podManagementPolicy: Parallel
   updateStrategy:

charts/ibm-mq/values.yaml

@@ -19,7 +19,7 @@ image:
   # repository is the container repository to use
   repository: icr.io/ibm-messaging/mq
   # tag is the tag to use for the container repository
-  tag: 9.4.0.0-r3
+  tag: 9.4.1.0-r1
   # 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/)

samples/OpenShiftIBMPower/deploy/ibmpower.yaml

@@ -14,7 +14,7 @@
 license: accept
 image:
   repository: cp.icr.io/cp/ibm-mqadvanced-server
-  tag: 9.4.0.0-r3-ppc64le
+  tag: 9.4.1.0-r1-ppc64le
   pullSecret: ibm-entitlement-key
 queueManager:
   mqscConfigMaps:

samples/OpenShiftNativeHAMQAdvancedContainer/deploy/secureapp_nativeha.yaml

@@ -13,7 +13,7 @@
 # limitations under the License.
 image:
   repository: cp.icr.io/cp/ibm-mqadvanced-server
-  tag: 9.4.0.0-r3-amd64
+  tag: 9.4.1.0-r1-amd64
   pullSecret: ibm-entitlement-key
 license: accept
 queueManager: