[stable/rabbitmq-ha] Add ingress for management and customizable probes (#4749)

* [stable/rabbitmq-ha] Add ingress for management and customizable probes

* Update indents and defaults for ingress
This commit is contained in:
Corey O'Brien
2018-04-08 08:24:08 -07:00
committed by k8s-ci-robot
parent 4a3aaf3007
commit 1304260ce1
4 changed files with 75 additions and 5 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
name: rabbitmq-ha
apiVersion: v1
appVersion: 3.7.3
version: 1.2.0
version: 1.3.0
description: Highly available RabbitMQ cluster, the open source message broker
software that implements the Advanced Message Queuing Protocol (AMQP).
keywords:
+38
View File
@@ -0,0 +1,38 @@
{{- if .Values.ingress.enabled }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ template "rabbitmq-ha.fullname" . }}
labels:
app: {{ template "rabbitmq-ha.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
annotations:
{{- range $key, $value := .Values.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
rules:
{{- if .Values.ingress.hostName }}
- host: {{ .Values.ingress.hostName }}
http:
{{- else }}
- http:
{{- end }}
paths:
- path: {{ .Values.ingress.path }}
backend:
serviceName: {{ template "rabbitmq-ha.fullname" . }}
servicePort: http
{{- if .Values.ingress.tls }}
tls:
- hosts:
{{- if .Values.ingress.hostName }}
- {{ .Values.ingress.hostName }}
secretName: {{ .Values.ingress.tlsSecret }}
{{- else}}
- secretName: {{ .Values.ingress.tlsSecret }}
{{- end }}
{{- end }}
{{- end }}
@@ -85,15 +85,17 @@ spec:
command:
- rabbitmqctl
- status
initialDelaySeconds: 30
timeoutSeconds: 5
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
readinessProbe:
exec:
command:
- rabbitmqctl
- status
initialDelaySeconds: 10
timeoutSeconds: 5
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
env:
- name: MY_POD_NAME
valueFrom:
+30
View File
@@ -227,3 +227,33 @@ serviceAccount:
## The name of the ServiceAccount to use.
## If not set and create is true, a name is generated using the fullname template
# name:
ingress:
## Set to true to enable ingress record generation
enabled: false
path: /
## The list of hostnames to be covered with this ingress record.
## Most likely this will be just one host, but in the event more hosts are needed, this is an array
## hostName: foo.bar.com
## Set this to true in order to enable TLS on the ingress record
tls: false
## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
tlsSecret: myTlsSecret
## Ingress annotations done as key:value pairs
annotations:
# kubernetes.io/ingress.class: nginx
livenessProbe:
initialDelaySeconds: 120
timeoutSeconds: 5
failureThreshold: 6
readinessProbe:
initialDelaySeconds: 10
timeoutSeconds: 3
periodSeconds: 5