Skip to content

Commit d218ef6

Browse files
callumpjacksoncallumpjackson
authored
Merge pull request #118 from ibm-messaging/12.0.1
Updates for CRR and other PR
2 parents 0b43f3a + 7ebfb10 commit d218ef6

26 files changed

+934
-15
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Please ensure all items are complete before opening.
2+
3+
- [ ] Tick to sign-off your agreement to the [Developer's Certificate of Origin](https://github.com/ibm-messaging/mq-helm/DCO1.1.txt)
4+
- [ ] You have added README updates for any code changes
5+
- [ ] You have completed the PR template below:
6+
7+
## What
8+
9+
What was changed
10+
11+
## How
12+
13+
How the change was implemented or reasoning behind it
14+
15+
## Testing
16+
17+
How to test your changes work, not required for documentation changes.
18+
19+
## Issues
20+
21+
Links to the github issue(s) (if present) that this pull request is resolving.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ samples/AzureAKSMultiInstance/deploy/mtlsqm.yaml
88
samples/AzureAKSMultiInstance/test/ccdt_generated.json
99
samples/OpenShiftNativeHA/deploy/mtlsqm.yaml
1010
samples/OpenShiftNativeHA/test/ccdt_generated.json
11+
samples/AWSEKSCrossRegionReplication/deploy/mtlsqm.yaml
12+
samples/AWSEKSCrossRegionReplication/test/ccdt_generated.json

‎charts/ibm-mq/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
apiVersion: v2
1515
name: ibm-mq
1616
description: IBM MQ queue manager
17-
version: 12.0.0
17+
version: 12.0.1
1818
type: application
1919
appVersion: 9.4.2.0
2020
kubeVersion: ">=1.18.0-0"

‎charts/ibm-mq/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ Alternatively, each parameter can be specified by using the `--set key=value[,ke
111111
| `image.tag` | Image tag | `9.4.2.0-r1` |
112112
| `image.pullPolicy` | Setting that controls when the kubelet attempts to pull the specified image. | `IfNotPresent` |
113113
| `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` |
114+
| `image.disableDefaultPullSecret` | By default the ibm-entitlement-key is specified within the created service account. If this should be removed set this property to `true` | `false` |
114115
| `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` |
115116
| `credentials.secret` | Provide the name of a Secret that contains keys "mqAdminPassword" and "mqAppPassword" with passwords as their respective values. This Secret will be mounted into MQ. | `mq-credentials` |
116117
| `metadata.labels` | The labels field serves as a pass-through for Pod labels. Users can add any label to this field and have it apply to the Pod. | `{}` |

‎charts/ibm-mq/templates/NOTES.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@ Get the NativeHA CRR Traffic URL to configure the replication address, by runnin
3333
export HACRR_ROUTE=$(kubectl get route {{ include "ibm-mq.fullname" . }}-nhacrr -n {{ .Release.Namespace }} -o jsonpath="{.spec.host}")
3434
echo $HACRR_ROUTE\(443\)
3535
{{ end -}}
36+
37+
{{- if and .Values.route.loadBalancer.hacrrtraffic .Values.queueManager.nativeha.nativehaGroup }}
38+
Get the NativeHA CRR Traffic URL to configure the replication address, by running these commands:
39+
export HACRR_ADDRESS=$(kubectl get services {{ include "ibm-mq.fullname" . }}-loadbalancer-hacrr -n {{ .Release.Namespace }} -o jsonpath="{..hostname}")$(kubectl get services {{ include "ibm-mq.fullname" . }}-loadbalancer-hacrr -n {{ .Release.Namespace }} -o jsonpath="{..ip}")
40+
echo $HACRR_ADDRESS\(9415\)
41+
{{ end -}}

‎charts/ibm-mq/templates/service-ingress.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# © Copyright IBM Corporation 2023
1+
# © Copyright IBM Corporation 2023, 2025
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -30,16 +30,16 @@ spec:
3030
service:
3131
name: {{ include "ibm-mq.fullname" . }}
3232
port:
33-
number: 9443
33+
name: console-https
3434
ingressClassName: nginx
3535
rules:
3636
{{- if .Values.route.ingress.webconsole.hostname }}
3737
- host: {{ .Values.route.ingress.webconsole.hostname }}
3838
http:
3939
{{- else }}
40-
- http:
40+
- http:
4141
{{- end }}
42-
paths:
42+
paths:
4343
{{- if .Values.route.ingress.webconsole.path }}
4444
- path: {{ .Values.route.ingress.webconsole.path }}
4545
{{- else }}
@@ -48,19 +48,19 @@ spec:
4848
pathType: Prefix
4949
backend:
5050
service:
51-
name: {{ include "ibm-mq.fullname" . }}-web
51+
name: {{ include "ibm-mq.fullname" . }}
5252
port:
53-
number: 9443
53+
name: console-https
5454
{{- if .Values.route.ingress.webconsole.tls.enable }}
5555
tls:
56-
{{- if .Values.route.ingress.webconsole.hostname}}
56+
{{- if .Values.route.ingress.webconsole.hostname }}
5757
- hosts:
58-
- {{ .Values.route.ingress.webconsole.hostname }}
59-
{{- if .Values.route.ingress.webconsole.tls.secret}}
58+
- {{ .Values.route.ingress.webconsole.hostname }}
59+
{{- if .Values.route.ingress.webconsole.tls.secret }}
6060
secretName: {{ .Values.route.ingress.webconsole.tls.secret }}
6161
{{- end }}
6262
{{- else }}
6363
- secretName: {{ .Values.route.ingress.webconsole.tls.secret }}
6464
{{- end }}
6565
{{- end }}
66-
{{- end }}
66+
{{- end }}

‎charts/ibm-mq/templates/service-loadbalancer-hacrr.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{{- if (.Values.route.loadBalancer.hacrrtraffic) }}
2+
# © Copyright IBM Corporation 2025
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
# A seperate load balancer to MQ data and web console is used. On certain
17+
# platforms, such as AWS EKS, if all ports are combined it does not work.
18+
# This is due to port 1414 not being open in recovery mode. Therefore a
19+
# individual loadbalancer for Native HA CRR is created.
20+
21+
apiVersion: v1
22+
kind: Service
23+
metadata:
24+
name: {{ include "ibm-mq.fullname" . }}-loadbalancer-hacrr
25+
labels:
26+
{{- include "ibm-mq.labels" . | nindent 4 }}
27+
# Additional annotations to be added to the load balancer annotations
28+
{{- with .Values.route.loadBalancer.annotations }}
29+
annotations:
30+
{{- toYaml . | nindent 4 }}
31+
{{- end }}
32+
spec:
33+
type: LoadBalancer
34+
ports:
35+
{{- if .Values.route.loadBalancer.hacrrtraffic }}
36+
- port: 9415
37+
name: ha-crr
38+
{{- end }}
39+
{{- if .Values.route.loadBalancer.loadBalancerSourceRanges }}
40+
loadBalancerSourceRanges:
41+
{{- range $group := .Values.route.loadBalancer.loadBalancerSourceRanges }}
42+
- {{ $group -}}
43+
{{ end }}
44+
{{- end }}
45+
selector:
46+
{{- include "ibm-mq.selectorLabels" . | nindent 4 }}
47+
{{- end }}

‎charts/ibm-mq/templates/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
name: console-https
2525
- port: 1414
2626
name: qmgr
27-
{{- if .Values.route.openShiftRoute.hacrrtraffic }}
27+
{{- if .Values.queueManager.nativeha.nativehaGroup }}
2828
- port: 9415
2929
name: ha-crr
3030
{{- end }}

‎charts/ibm-mq/templates/serviceaccount.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# © Copyright IBM Corporation 2021
1+
# © Copyright IBM Corporation 2021, 2025
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -17,8 +17,14 @@ metadata:
1717
name: {{ include "ibm-mq.fullname" ( . ) }}
1818
labels:
1919
{{- include "ibm-mq.labels" . | nindent 4 }}
20+
{{- if not .Values.image.disableDefaultPullSecret }}
2021
imagePullSecrets:
22+
{{- else if .Values.queueManager.multiinstance.enable }}
23+
imagePullSecrets:
24+
{{- end }}
25+
{{- if not .Values.image.disableDefaultPullSecret }}
2126
- name: ibm-entitlement-key
27+
{{- end }}
2228
{{- if .Values.image.pullSecret }}
2329
- name: {{ .Values.image.pullSecret }}
2430
{{- end }}

‎charts/ibm-mq/values.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ image:
2424
pullSecret:
2525
# pullPolicy is either IfNotPresent or Always (https://kubernetes.io/docs/concepts/containers/images/)
2626
pullPolicy: IfNotPresent
27+
# disableDefaultPullSecret to use when pulling the image from a private registry and the ibm-entitlement-key is not required
28+
disableDefaultPullSecret: false
2729

2830
# set passwords for users: "admin" and "app"
2931
credentials:
@@ -40,7 +42,7 @@ metadata:
4042
# persistence section specifies persistence settings which apply to the whole chart
4143
persistence:
4244

43-
# dataPVC section specifies settings for the main Persistent Volume Claim, which is used for data in /var/mqm -> /mnt/mqm
45+
# dataPVC section specifies settings for the main Persistent Volume Claim, which is used for data in /mnt/mqm-data
4446
dataPVC:
4547
# enabled is whether to use this Persistent Volumes or not
4648
enable: false
@@ -62,7 +64,7 @@ persistence:
6264
## storageClass to use for this PVCs
6365
storageClassName: ""
6466

65-
# dataPVC section specifies settings for the main Persistent Volume Claim, which is used for data in /mnt/mqm-data
67+
# qmPVC section specifies settings for the main Persistent Volume Claim, which is used for data in /mnt/mqm
6668
qmPVC:
6769
# enabled is whether to use this Persistent Volumes or not
6870
enable: true

0 commit comments

Comments
 (0)