added configurable timing for liveness and readiness probes

curityio · Oct 13, 2020 · dc143d2 · dc143d2
1 parent e0b8f75
commit dc143d2
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 5 deletions.
diff --git a/idsvr/Chart.yaml b/idsvr/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: idsvr
-version: 0.9.7
+version: 0.9.8
 appVersion: 5.3.1
 description: A Helm chart for Curity Identity Server
 keywords:

diff --git a/idsvr/README.md b/idsvr/README.md
@@ -56,12 +56,32 @@ Parameter | Description | Default
 `curity.admin.role`| The role of the admin server |`admin`
 `curity.admin.service.type`| The admin service type |`ClusterIP`
 `curity.admin.service.port`| The admin configuration port |`6789`
+`curity.admin.livenessProbe.timeoutSeconds`| LivenessProbe `timeoutSeconds` for the admin deployment |`1`
+`curity.admin.livenessProbe.failureThreshold`| LivenessProbe `failureThreshold` for the admin deployment |`3`
+`curity.admin.livenessProbe.successThreshold`| LivenessProbe `successThreshold` for the admin deployment |`3`
+`curity.admin.livenessProbe.periodSeconds`| LivenessProbe `periodSeconds` for the admin deployment |`10`
+`curity.admin.livenessProbe.initialDelaySeconds`| The admin `initialDelaySeconds` port |`30`
+`curity.admin.readinessProbe.timeoutSeconds`| ReadinessProbe `timeoutSeconds` for the admin deployment |`1`
+`curity.admin.readinessProbe.failureThreshold`| ReadinessProbe `failureThreshold` for the admin deployment  |`3`
+`curity.admin.readinessProbe.successThreshold`| ReadinessProbe `successThreshold` for the admin deployment  |`3`
+`curity.admin.readinessProbe.periodSeconds`| ReadinessProbe `periodSeconds` for the admin deployment  |`10`
+`curity.admin.readinessProbe.initialDelaySeconds`| ReadinessProbe `initialDelaySeconds` for the admin deployment  |`30`
 `curity.admin.logging.stdout`| Flag to enable/disable extra containers that tail the logs in `var/log` folder. |`false`
 `curity.admin.logging.logs`| Array of the extra containers that will be included in the admin pod |`[]`
 `curity.admin.logging.image`| The image that will be used to create the logging containers |`busybox:latest`
 `curity.runtime.role`| The role of the runtime servers |`default`
 `curity.runtime.service.type`| The runtime service type |`ClusterIP`
 `curity.runtime.service.port`| The runtime service port |`8443`
+`curity.runtime.livenessProbe.timeoutSeconds`| LivenessProbe `timeoutSeconds` for the runtime deployment |`1`
+`curity.runtime.livenessProbe.failureThreshold`| LivenessProbe `failureThreshold` for the runtime deployment |`3`
+`curity.runtime.livenessProbe.successThreshold`| LivenessProbe `successThreshold` for the runtime deployment |`3`
+`curity.runtime.livenessProbe.periodSeconds`| LivenessProbe `periodSeconds` for the runtime deployment |`10`
+`curity.runtime.livenessProbe.initialDelaySeconds`| The admin `initialDelaySeconds` port |`30`
+`curity.runtime.readinessProbe.timeoutSeconds`| ReadinessProbe `timeoutSeconds` for the runtime deployment |`1`
+`curity.runtime.readinessProbe.failureThreshold`| ReadinessProbe `failureThreshold` for the runtime deployment  |`3`
+`curity.runtime.readinessProbe.successThreshold`| ReadinessProbe `successThreshold` for the runtime deployment  |`3`
+`curity.runtime.readinessProbe.periodSeconds`| ReadinessProbe `periodSeconds` for the runtime deployment  |`10`
+`curity.runtime.readinessProbe.initialDelaySeconds`| ReadinessProbe `initialDelaySeconds` for the runtime deployment  |`30`
 `curity.runtime.logging.stdout`| Flag to enable/disable extra containers that tail the logs in `var/log` folder. |`false`
 `curity.runtime.logging.logs`| Array of the extra containers that will be included in the runtime pods |`[]`
 `curity.runtime.logging.image`| The image that will be used to create the logging containers |`busybox:latest`

diff --git a/idsvr/templates/deployment-admin.yaml b/idsvr/templates/deployment-admin.yaml
@@ -66,12 +66,20 @@ spec:
             httpGet:
               path: /
               port: health-check
-            initialDelaySeconds: 30
+            timeoutSeconds:  {{ .Values.curity.admin.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.curity.admin.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.curity.admin.livenessProbe.successThreshold }}
+            periodSeconds: {{ .Values.curity.admin.livenessProbe.periodSeconds }}
+            initialDelaySeconds: {{ .Values.curity.admin.livenessProbe.initialDelaySeconds }}
           readinessProbe:
             httpGet:
               path: /
               port: health-check
-            initialDelaySeconds: 30
+            timeoutSeconds:  {{ .Values.curity.admin.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.curity.admin.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.curity.admin.readinessProbe.successThreshold }}
+            periodSeconds: {{ .Values.curity.admin.readinessProbe.periodSeconds }}
+            initialDelaySeconds: {{ .Values.curity.admin.readinessProbe.initialDelaySeconds }}
           volumeMounts:
             {{- if .Values.curity.admin.logging.stdout }}
             - mountPath: /opt/idsvr/var/log/

diff --git a/idsvr/templates/deployment-runtime.yaml b/idsvr/templates/deployment-runtime.yaml
@@ -52,12 +52,20 @@ spec:
             httpGet:
               path: /
               port: health-check
-            initialDelaySeconds: 30
+            timeoutSeconds:  {{ .Values.curity.runtime.livenessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.curity.runtime.livenessProbe.failureThreshold }}
+            successThreshold: {{ .Values.curity.runtime.livenessProbe.successThreshold }}
+            periodSeconds: {{ .Values.curity.runtime.livenessProbe.periodSeconds }}
+            initialDelaySeconds: {{ .Values.curity.runtime.livenessProbe.initialDelaySeconds }}
           readinessProbe:
             httpGet:
               path: /
               port: health-check
-            initialDelaySeconds: 30
+            timeoutSeconds:  {{ .Values.curity.runtime.readinessProbe.timeoutSeconds }}
+            failureThreshold: {{ .Values.curity.runtime.readinessProbe.failureThreshold }}
+            successThreshold: {{ .Values.curity.runtime.readinessProbe.successThreshold }}
+            periodSeconds: {{ .Values.curity.runtime.readinessProbe.periodSeconds }}
+            initialDelaySeconds: {{ .Values.curity.runtime.readinessProbe.initialDelaySeconds }}
           volumeMounts:
             {{- if .Values.curity.runtime.logging.stdout }}
             - mountPath: /opt/idsvr/var/log/

diff --git a/idsvr/values.yaml b/idsvr/values.yaml
@@ -24,6 +24,18 @@ curity:
     service:
       type: ClusterIP
       port: 6789
+    livenessProbe:
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 3
+      periodSeconds: 10
+      initialDelaySeconds: 30
+    readinessProbe:
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 3
+      periodSeconds: 10
+      initialDelaySeconds: 30
     logging:
       image: "busybox:latest"
       stdout: false
@@ -41,6 +53,18 @@ curity:
     service:
       type: ClusterIP
       port: 8443
+    livenessProbe:
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 3
+      periodSeconds: 10
+      initialDelaySeconds: 30
+    readinessProbe:
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 3
+      periodSeconds: 10
+      initialDelaySeconds: 30
     logging:
       image: "busybox:latest"
       stdout: false