Move liveness and readiness probe to values.yaml (helm#7982)

* move readiness and liveness probe details to value.yaml Signed-off-by: Shubham Jain <[email protected]> * chart version bumped Signed-off-by: Shubham Jain <[email protected]> * Remove trailing spaces Signed-off-by: Shubham Jain <[email protected]> * Update Chart.yaml Signed-off-by: Reinhard Nägele <[email protected]>
agolo · Oct 31, 2018 · 761b676 · 761b676
1 parent d7fe05b
commit 761b676
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/stable/rethinkdb/Chart.yaml b/stable/rethinkdb/Chart.yaml
@@ -1,6 +1,6 @@
 name: rethinkdb
 description: The open-source database for the realtime web
-version: 0.1.4
+version: 0.2.0
 appVersion: 0.1.0
 keywords:
 - rethinkdb

diff --git a/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml b/stable/rethinkdb/templates/rethinkdb-cluster-stateful-set.yaml
@@ -64,15 +64,9 @@ spec:
                 fieldRef:
                   fieldPath: metadata.name
           livenessProbe:
-            exec:
-              command:
-                - /rethinkdb-probe
-            failureThreshold: 3
-            initialDelaySeconds: 15
-            periodSeconds: 10
-            successThreshold: 1
-            timeoutSeconds: 5
+{{ toYaml .Values.cluster.livenessProbe | indent 12 }}          
           readinessProbe:
+{{ toYaml .Values.cluster.readinessProbe | indent 12 }}
             exec:
               command:
                 - /rethinkdb-probe

diff --git a/stable/rethinkdb/values.yaml b/stable/rethinkdb/values.yaml
@@ -32,6 +32,24 @@ cluster:
     annotations: {}
   # RethinkDB Cache Size in MB
   rethinkCacheSize: 100
+  livenessProbe:
+    exec:
+      command:
+        - /rethinkdb-probe
+    failureThreshold: 3
+    initialDelaySeconds: 15
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 5
+  readinessProbe:
+    exec:
+      command:
+        - /rethinkdb-probe
+    failureThreshold: 3
+    initialDelaySeconds: 15
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 5
 
 # RethinkDB Proxy Config
 proxy: