Skip to content

Commit

Permalink
Make liveness and readiness probes configurable (helm#19637)
Browse files Browse the repository at this point in the history
Signed-off-by: Maarten de Waard <maarten@greenhost.nl>
  • Loading branch information
Maarten authored and includerandom committed Jul 19, 2020
1 parent b9c8df5 commit d1e5120
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 5 deletions.
2 changes: 1 addition & 1 deletion stable/rocketchat/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: rocketchat
version: 2.0.1
version: 2.0.2
appVersion: 2.4.9
description: Prepare to take off with the ultimate chat platform, experience the next level of team communications
keywords:
Expand Down
12 changes: 12 additions & 0 deletions stable/rocketchat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,18 @@ Parameter | Description | Default
`ingress.annotations` | Annotations for the ingress | `{}`
`ingress.path` | Path of the ingress | `/`
`ingress.tls` | A list of [IngressTLS](https://kubernetes.io/docs/reference/federation/extensions/v1beta1/definitions/#_v1beta1_ingresstls) items | `[]`
`livenessProbe.enabled` | Turn on and off liveness probe | `true`
`livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `60`
`livenessProbe.periodSeconds` | How often to perform the probe | `15`
`livenessProbe.timeoutSeconds` | When the probe times out | `5`
`livenessProbe.failureThreshold` | Minimum consecutive failures for the probe | `3`
`livenessProbe.successThreshold` | Minimum consecutive successes for the probe | `1`
`readinessProbe.enabled` | Turn on and off readiness probe | `true`
`readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | `10`
`readinessProbe.periodSeconds` | How often to perform the probe | `15`
`readinessProbe.timeoutSeconds` | When the probe times out | `5`
`readinessProbe.failureThreshold` | Minimum consecutive failures for the probe | `3`
`readinessProbe.successThreshold` | Minimum consecutive successes for the probe | `1`
`service.annotations` | Annotations for the Rocket.Chat service | `{}`
`service.labels` | Additional labels for the Rocket.Chat service | `{}`
`service.type` | The service type to use | `ClusterIP`
Expand Down
18 changes: 14 additions & 4 deletions stable/rocketchat/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,28 @@ spec:
ports:
- name: http
containerPort: 3000
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /api/info
port: http
initialDelaySeconds: 60
timeoutSeconds: 5
initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
{{- end }}
{{- if .Values.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: /api/info
port: http
initialDelaySeconds: 10
timeoutSeconds: 5
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
{{- end }}
resources:
{{ toYaml .Values.resources | indent 10 }}
volumeMounts:
Expand Down
19 changes: 19 additions & 0 deletions stable/rocketchat/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,22 @@ podAnnotations: {}
# prometheus.io/port: "9458"
# prometheus.io/path: "/metrics"
# prometheus.io/scrape: "true"

## Liveness and readiness probe values
## Ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
##
livenessProbe:
enabled: true
initialDelaySeconds: 60
periodSeconds: 15
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1

readinessProbe:
enabled: true
initialDelaySeconds: 10
periodSeconds: 15
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1

0 comments on commit d1e5120

Please sign in to comment.