HELM-48: New probe (startup) and new options for liveness/readiness

xwiki-contrib · Nov 2, 2023 · 75aeb0e · 75aeb0e
1 parent 67e3ecf
commit 75aeb0e
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 3 deletions.
diff --git a/charts/xwiki/Chart.yaml b/charts/xwiki/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: XWiki is a free wiki software platform written in Java with a design emphasis on extensibility. XWiki is an enterprise wiki. It includes WYSIWYG editing, OpenDocument based document import/export, semantic annotations and tagging, and advanced permissions management.
 name: xwiki
-version: 1.2.3
+version: 1.2.4-Beta.1
 type: application
 keywords:
 - xwiki

diff --git a/charts/xwiki/templates/xwiki.yaml b/charts/xwiki/templates/xwiki.yaml
@@ -103,10 +103,32 @@ spec:
             configMapKeyRef:
               name: {{ $fullName }}
               key: DB_DATABASE
+      {{- if .Values.probes.startup.enabled }}
+        startupProbe:
+        {{- if .Values.probes.startup.httpGet.enabled }}
+          httpGet:
+            path: {{ .Values.probes.startup.httpGet.path }}
+            port: {{ .Values.service.internalPort }}
+        {{- else }}
+          tcpSocket:
+            port: {{ .Values.service.internalPort }}
+        {{- end }}
+          initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
+          timeoutSeconds: {{ .Values.probes.startup.timeoutSeconds }}
+          periodSeconds: {{ .Values.probes.startup.periodSeconds }}
+          failureThreshold: {{ .Values.probes.startup.failureThreshold }}
+          successThreshold: {{ .Values.probes.startup.successThreshold }}
+      {{- end }}
       {{- if .Values.probes.liveness.enabled }}
         livenessProbe:
+        {{- if .Values.probes.liveness.httpGet.enabled }}
+          httpGet:
+            path: {{ .Values.probes.liveness.httpGet.path }}
+            port: {{ .Values.service.internalPort }}
+        {{- else }}
           tcpSocket:
             port: {{ .Values.service.internalPort }}
+        {{- end }}
           initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
           timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
           periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -115,8 +137,14 @@ spec:
       {{- end }}
       {{- if .Values.probes.readiness.enabled }}
         readinessProbe:
+        {{- if .Values.probes.readiness.httpGet.enabled }}
+          httpGet:
+            path: {{ .Values.probes.liveness.httpGet.path }}
+            port: {{ .Values.service.internalPort }}
+        {{- else }}
           tcpSocket:
             port: {{ .Values.service.internalPort }}
+        {{- end }}
           initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
           timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
           periodSeconds: {{ .Values.probes.readiness.periodSeconds }}

diff --git a/charts/xwiki/values.yaml b/charts/xwiki/values.yaml
@@ -372,16 +372,32 @@ autoscaling:
 
 # Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
 probes:
-  liveness:
+  startup:
     enabled: true
+    httpGet:
+      enabled: false
+      path: /
     initialDelaySeconds: 120
     timeoutSeconds: 60
     periodSeconds: 30
     failureThreshold: 5
     successThreshold: 1
-
+  liveness:
+    enabled: true
+    httpGet:
+      enabled: true
+      path: /rest
+    initialDelaySeconds: 30
+    timeoutSeconds: 3
+    periodSeconds: 30
+    # 5 minutes 
+    failureThreshold: 10
+    successThreshold: 1
   readiness:
     enabled: true
+    httpGet:
+      enabled: true
+      path: /rest/wikis/xwiki/spaces
     initialDelaySeconds: 30
     timeoutSeconds: 3
     periodSeconds: 30