You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/11/05 21:47:46 UTC

[sling-org-apache-sling-app-cms] 04/04: Fixing live / ready checks to not time out too soon

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 8f0c29e094b69695c1edc6eb01bd110d12509be7
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Nov 5 16:47:29 2020 -0500

    Fixing live / ready checks to not time out too soon
---
 helm/slingcms-standalone/templates/deployment.yaml | 22 ++++++++++++++-
 helm/slingcms-standalone/values.yaml               | 32 ++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/helm/slingcms-standalone/templates/deployment.yaml b/helm/slingcms-standalone/templates/deployment.yaml
index 0857c30..cfe95b4 100644
--- a/helm/slingcms-standalone/templates/deployment.yaml
+++ b/helm/slingcms-standalone/templates/deployment.yaml
@@ -54,10 +54,20 @@ spec:
               containerPort: 8080
               protocol: TCP
           livenessProbe:
+            initialDelaySeconds: {{ .Values.livenessProbe.cms.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.cms.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.cms.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.cms.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.cms.failureThreshold }}
             httpGet:
               path: /system/health
               port: http
           readinessProbe:
+            initialDelaySeconds: {{ .Values.readinessProbe.cms.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.cms.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.cms.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.cms.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.cms.failureThreshold }}
             httpGet:
               path: /system/health
               port: http
@@ -78,10 +88,20 @@ spec:
               containerPort: 80
               protocol: TCP
           livenessProbe:
+            initialDelaySeconds: {{ .Values.livenessProbe.web.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.web.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.web.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.web.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.web.failureThreshold }}
             httpGet:
               path: /
               port: http
           readinessProbe:
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
             httpGet:
               path: /
               port: http
@@ -98,4 +118,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
\ No newline at end of file
diff --git a/helm/slingcms-standalone/values.yaml b/helm/slingcms-standalone/values.yaml
index 5f89b39..1243fda 100644
--- a/helm/slingcms-standalone/values.yaml
+++ b/helm/slingcms-standalone/values.yaml
@@ -33,6 +33,38 @@ image:
     # Overrides the image tag whose default is the chart appVersion.
     tag: 0.16.3-snapshot
 
+
+livenessProbe:
+  cms:
+    enabled: true
+    initialDelaySeconds: 120
+    periodSeconds: 5
+    timeoutSeconds: 5
+    failureThreshold: 24
+    successThreshold: 1
+  web:
+    enabled: true
+    initialDelaySeconds: 60
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+readinessProbe:
+  cms:
+    enabled: true
+    initialDelaySeconds: 120
+    periodSeconds: 5
+    timeoutSeconds: 5
+    failureThreshold: 24
+    successThreshold: 1
+  web:
+    enabled: true
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 5
+    failureThreshold: 6
+    successThreshold: 1
+
 resources:
   cms:
     requests: