Merge pull request #1242 from consideRatio/pr/readiness-probe

[MRG] helm chart: add readinessProbe and let probes be configurable
jupyterhub · Jan 9, 2021 · cb2fa46 · cb2fa46
2 parents 84fc257 + 32e06ee
commit cb2fa46
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/helm-chart/binderhub/templates/deployment.yaml b/helm-chart/binderhub/templates/deployment.yaml
@@ -121,10 +121,23 @@ spec:
         ports:
           - containerPort: 8585
             name: binder
+        {{- if .Values.deployment.readinessProbe.enabled }}
+        readinessProbe:
+          httpGet:
+            path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
+            port: binder
+          initialDelaySeconds: {{ .Values.deployment.readinessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.deployment.readinessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.deployment.readinessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.deployment.readinessProbe.failureThreshold }}
+        {{- end }}
+        {{- if .Values.deployment.livenessProbe.enabled }}
         livenessProbe:
           httpGet:
             path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
             port: binder
-          initialDelaySeconds: 10
-          periodSeconds: 5
-          timeoutSeconds: 10
+          initialDelaySeconds: {{ .Values.deployment.livenessProbe.initialDelaySeconds }}
+          periodSeconds: {{ .Values.deployment.livenessProbe.periodSeconds }}
+          timeoutSeconds: {{ .Values.deployment.livenessProbe.timeoutSeconds }}
+          failureThreshold: {{ .Values.deployment.livenessProbe.failureThreshold }}
+        {{- end }}
diff --git a/helm-chart/binderhub/values.yaml b/helm-chart/binderhub/values.yaml
@@ -145,6 +145,18 @@ jupyterhub:
       enabled: false
 
 deployment:
+  readinessProbe:
+    enabled: true
+    initialDelaySeconds: 0
+    periodSeconds: 5
+    failureThreshold: 1000  # we rely on the liveness probe to resolve issues if needed
+    timeoutSeconds: 3
+  livenessProbe:
+    enabled: true
+    initialDelaySeconds: 10
+    periodSeconds: 5
+    failureThreshold: 3
+    timeoutSeconds: 10
   labels: {}
 
 dind: