[stable/rabbitmq-ha] Fix health checks (#8129)

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
This commit is contained in:
Steven Sheehy
2018-10-14 14:20:49 -07:00
committed by k8s-ci-robot
parent 1a7882e3e3
commit 96aa6771f1
3 changed files with 16 additions and 18 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: rabbitmq-ha
apiVersion: v1
appVersion: 3.7.4
version: 1.11.0
version: 1.11.1
description: Highly available RabbitMQ cluster, the open source message broker
software that implements the Advanced Message Queuing Protocol (AMQP).
keywords:
+12 -14
View File
@@ -101,26 +101,24 @@ spec:
protocol: TCP
containerPort: 5671
{{- end }}
{{- $managementCredentials := printf "%s:%s" .Values.managementUsername .Values.managementPassword | b64enc }}
{{- $managementHeader := printf "Authorization: Basic %s" $managementCredentials }}
livenessProbe:
httpGet:
path: /api/healthchecks/node
port: 15672
scheme: HTTP
httpHeaders:
- name: Authorization
value: Basic {{ printf "%s:%s" .Values.managementUsername .Values.managementPassword | b64enc }}
exec:
command:
- /bin/sh
- -c
- 'wget -O - -q --header "{{ $managementHeader }}" http://localhost:15672/api/healthchecks/node | grep -qF "{\"status\":\"ok\"}"'
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
readinessProbe:
httpGet:
path: /api/healthchecks/node
port: 15672
scheme: HTTP
httpHeaders:
- name: Authorization
value: Basic {{ printf "%s:%s" .Values.managementUsername .Values.managementPassword | b64enc }}
exec:
command:
- /bin/sh
- -c
- 'wget -O - -q --header "{{ $managementHeader }}" http://localhost:15672/api/healthchecks/node | grep -qF "{\"status\":\"ok\"}"'
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+3 -3
View File
@@ -228,8 +228,8 @@ resources: {}
# requests:
# cpu: 100mm
# memory: 1Gi
initContainer: {}
# resources:
initContainer:
resources: {}
# limits:
# cpu: 100mm
# memory: 128Mi
@@ -322,7 +322,7 @@ livenessProbe:
readinessProbe:
failureThreshold: 6
initialDelaySeconds: 10
initialDelaySeconds: 20
timeoutSeconds: 3
periodSeconds: 5