make liveness and readiness probe configurable (#13311)

Signed-off-by: Maarten de Waard <maarten@greenhost.nl>

Update chart version number, document liveness and readiness variables

Signed-off-by: Maarten de Waard <maarten@greenhost.nl>

make liveness and readiness probe configurable
This commit is contained in:
Maarten
2019-04-26 09:08:27 -07:00
committed by Kubernetes Prow Robot
parent cddc416a72
commit 175e4ad83e
4 changed files with 44 additions and 10 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "4.0.3.1"
description: A Helm chart for Collabora Office - CODE-Edition
name: collabora-code
version: 1.0.1
version: 1.0.2
icon: https://avatars0.githubusercontent.com/u/22418908?s=200&v=4
sources:
- https://github.com/CollaboraOnline/Docker-CODE
+13 -1
View File
@@ -74,7 +74,19 @@ The following tables lists the configurable parameters of this chart and their d
| `ingress.paths` | | `[]` |
| `ingress.hosts` | | `[]` |
| `ingress.tls` | | `[]` |
| `securityContext.allowPrivilegeEscalation` | Create & use Pod Security Policy resources | `true` |
| `livenessProbe.enabled` | Turn on and off liveness probe | `true` |
| `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `30` |
| `livenessProbe.periodSeconds` | How often to perform the probe | `10` |
| `livenessProbe.timeoutSeconds` | When the probe times out | `2` |
| `livenessProbe.successThreshold` | Minimum consecutive successes for the probe | `1` |
| `livenessProbe.failureThreshold` | Minimum consecutive failures for the probe | `3` |
| `readinessProbe.enabled` | Turn on and off readiness probe | `true` |
| `readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | `30` |
| `readinessProbe.periodSeconds` | How often to perform the probe | `10` |
| `readinessProbe.timeoutSeconds` | When the probe times out | `2` |
| `readinessProbe.successThreshold` | Minimum consecutive successes for the probe | `1` |
| `readinessProbe.failureThreshold` | Minimum consecutive failures for the probe | `3` |
| `securityContext.allowPrivilegeEscalation` | Create & use Pod Security Policy resources | `true` |
| `securitycontext.capabilities.add` | Collabora needs to run with MKNOD as capabibility | `[MKNOD]` |
| `resources` | Resources required (e.g. CPU, memory) | `{}` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
@@ -61,26 +61,32 @@ spec:
secretKeyRef:
name: {{ include "collabora-code.fullname" . }}
key: password
{{- if .Values.livenessProbe.enabled }}
livenessProbe:
failureThreshold: 3
httpGet:
path: /
port: http
scheme: HTTP
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 2
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:
failureThreshold: 3
httpGet:
path: /
port: http
scheme: HTTP
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 2
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
{{- end }}
ports:
- name: http
containerPort: {{ .Values.service.port }}
+16
View File
@@ -53,3 +53,19 @@ nodeSelector: {}
tolerations: []
affinity: {}
livenessProbe:
enabled: true
initialDelaySeconds: 30
timeoutSeconds: 2
periodSeconds: 10
successThreshold: 1
failureThreshold: 3
readinessProbe:
enabled: true
initialDelaySeconds: 30
timeoutSeconds: 2
periodSeconds: 10
successThreshold: 1
failureThreshold: 3