Skip to content

Commit 0caf682

Browse files
committed
Update readiness/liveness probes
Updated to reflect general recommendations from the rabbitmq docker repository (and via docker-library/rabbitmq#174 (comment)), and to generally support non-alpine versions of the image as the ubuntu image does not include wget (or curl) whereas `rabbitmqctl status` is included in both images, additionally the check looks more into the service status rather than the management plugins status. Signed-off-by: Jake Hill <[email protected]>
1 parent 4d45a15 commit 0caf682

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

stable/rabbitmq-ha/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: rabbitmq-ha
22
apiVersion: v1
33
appVersion: 3.7.15
4-
version: 1.30.0
4+
version: 2.0.0
55
description: Highly available RabbitMQ cluster, the open source message broker
66
software that implements the Advanced Message Queuing Protocol (AMQP).
77
keywords:

stable/rabbitmq-ha/templates/statefulset.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,20 +126,14 @@ spec:
126126
{{- end }}
127127
livenessProbe:
128128
exec:
129-
command:
130-
- /bin/sh
131-
- -c
132-
- 'wget -O - -q --header "Authorization: Basic `echo -n \"$RABBIT_MANAGEMENT_USER:$RABBIT_MANAGEMENT_PASSWORD\" | base64`" http://localhost:15672/api/healthchecks/node | grep -qF "{\"status\":\"ok\"}"'
129+
command: ["rabbitmqctl", "status"]
133130
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
134131
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
135132
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
136133
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
137134
readinessProbe:
138135
exec:
139-
command:
140-
- /bin/sh
141-
- -c
142-
- 'wget -O - -q --header "Authorization: Basic `echo -n \"$RABBIT_MANAGEMENT_USER:$RABBIT_MANAGEMENT_PASSWORD\" | base64`" http://localhost:15672/api/healthchecks/node | grep -qF "{\"status\":\"ok\"}"'
136+
command: ["rabbitmqctl", "status"]
143137
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
144138
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
145139
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}

stable/rabbitmq-ha/values.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -435,16 +435,16 @@ ingress:
435435
# kubernetes.io/ingress.class: nginx
436436

437437
livenessProbe:
438-
initialDelaySeconds: 120
439-
periodSeconds: 10
440-
timeoutSeconds: 5
438+
initialDelaySeconds: 60
439+
periodSeconds: 60
440+
timeoutSeconds: 15
441441
failureThreshold: 6
442442

443443
readinessProbe:
444-
failureThreshold: 6
445444
initialDelaySeconds: 20
446-
timeoutSeconds: 3
447-
periodSeconds: 5
445+
periodSeconds: 60
446+
timeoutSeconds: 10
447+
failureThreshold: 6
448448

449449
# Specifies an existing secret to be used for RMQ password, management user password and Erlang Cookie
450450
existingSecret: ""

0 commit comments

Comments
 (0)