Make readiness check via pod lable patcher optin

Author: lobo-ppi

charts/ibm-mq/templates/role-binding.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.readinessProbe.useLabelPatcher }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -11,3 +12,4 @@ subjects:
 - kind: ServiceAccount
   name: {{ include "ibm-mq.fullname" ( . ) }}
   namespace: ready-check
+{{ end -}}

charts/ibm-mq/templates/role.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.readinessProbe.useLabelPatcher }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -14,3 +15,4 @@ rules:
     {{- end }}
     ]
   verbs: ["get", "list","patch"]
+{{ end -}}

charts/ibm-mq/templates/service.yaml

@@ -26,4 +26,6 @@ spec:
     name: qmgr
   selector:
 {{- include "ibm-mq.selectorLabels" . | nindent 4 }}
+    {{- if .Values.readinessProbe.useLabelPatcher }}
     role: master
+    {{- end }}

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

@@ -272,11 +272,14 @@ spec:
           defaultMode: 420
           secretName: {{ .Values.credentials.secret }}
       {{- end }}
+      {{- if .Values.readinessProbe.useLabelPatcher }}
       volumes:
       - name: state
         emptyDir: {}
+      {{- end }}
       terminationGracePeriodSeconds: {{.Values.queueManager.terminationGracePeriodSeconds}}
       containers:
+        {{- if .Values.readinessProbe.useLabelPatcher }}
         - name: state-checker
           command:
             - sh
@@ -312,6 +315,7 @@ spec:
           volumeMounts:
             - mountPath: /etc/mqm/state
               name: state
+        {{- end }}
         - name: qmgr
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -409,8 +413,10 @@ spec:
           {{- else if .Values.web.manualConfig.secret.name }}
           volumeMounts:
           {{- end}}
+          {{- if .Values.readinessProbe.useLabelPatcher }}
           - name: state
             mountPath: /etc/mqm/state
+          {{- end }}
           {{- if .Values.queueManager.nativeha.tls }}
           {{- if .Values.queueManager.nativeha.tls.secretName }}
           - name: ha-tls
@@ -532,12 +538,17 @@ spec:
           # Set readiness probe to determine if the MQ listener is running
           readinessProbe:
             exec:
+              {{- if .Values.readinessProbe.useLabelPatcher }}
               command:
               - sh
               - '-c'
               - >
                 chkmqready;
                 echo $? > /etc/mqm/state/test
+              {{- else }}
+              command:
+              - chkmqready
+              {{- end }}
             {{- if or .Values.queueManager.nativeha.enable .Values.queueManager.multiinstance.enable }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 0 }}
             {{- else }}

charts/ibm-mq/values.yaml

@@ -139,6 +139,7 @@ livenessProbe:
 
 # readinessProbe section specifies setting for the MQ readiness probe, which checks when the MQ listener is running
 readinessProbe:
+  useLabelPatcher: false
   initialDelaySeconds:
   periodSeconds: 5
   timeoutSeconds: 3