[stable/mongodb] make metrics exporter checks configurable (helm#11587)

Signed-off-by: Abhishek Jaisingh <[email protected]>
faraazkhan · Feb 22, 2019 · f62326e · f62326e
1 parent c20aa5c
commit f62326e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/stable/mongodb/Chart.yaml b/stable/mongodb/Chart.yaml
@@ -1,5 +1,5 @@
 name: mongodb
-version: 5.4.0
+version: 5.5.0
 appVersion: 4.0.6
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 keywords:

diff --git a/stable/mongodb/README.md b/stable/mongodb/README.md
@@ -119,6 +119,10 @@ The following table lists the configurable parameters of the MongoDB chart and t
 | `metrics.serviceMonitor.relabellings`              | Specify Metric Relabellings to add to the scrape endpoint                                    | `nil`                                                   |
 | `metrics.serviceMonitor.alerting.rules`            | Define individual alerting rules as required                                                 | {}                                                      |
 | `metrics.serviceMonitor.alerting.additionalLabels` | Used to pass Labels that are required by the Installed Prometheus Operator                   | {}                                                      |
+| `metrics.livenessProbe.initialDelaySeconds`       | Iniitial Delay for Liveness Check of Prometheus metrics exporter                             | 15                                                      |
+| `metrics.livenessProbe.timeoutSeconds`             | Timeout for Liveness Check of Prometheus metrics exporter                                    | 5                                                       |
+| `metrics.readinessProbe.initialDelaySeconds`      | Iniitial Delay for Readiness Check of Prometheus metrics exporter                            | 5                                                      |
+| `metrics.readinessProbe.timeoutSeconds`            | Timeout for Readiness Check of Prometheus metrics exporter                                   | 1                                                       |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

diff --git a/stable/mongodb/templates/deployment-standalone.yaml b/stable/mongodb/templates/deployment-standalone.yaml
@@ -176,14 +176,14 @@ spec:
           httpGet:
             path: /metrics
             port: metrics
-          initialDelaySeconds: 15
-          timeoutSeconds: 5
+          initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }}
+          timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }}
         readinessProbe:
           httpGet:
             path: /metrics
             port: metrics
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
+          initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }}
+          timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }}
         resources:
 {{ toYaml .Values.metrics.resources | indent 10 }}
 {{- end }}

diff --git a/stable/mongodb/templates/statefulset-primary-rs.yaml b/stable/mongodb/templates/statefulset-primary-rs.yaml
@@ -197,14 +197,14 @@ spec:
             httpGet:
               path: /metrics
               port: metrics
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
+            initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }}
+            timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }}
           readinessProbe:
             httpGet:
               path: /metrics
               port: metrics
-            initialDelaySeconds: 5
-            timeoutSeconds: 1
+            initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }}
+            timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }}
           resources:
 {{ toYaml .Values.metrics.resources | indent 12 }}
 {{- end }}

diff --git a/stable/mongodb/templates/statefulset-secondary-rs.yaml b/stable/mongodb/templates/statefulset-secondary-rs.yaml
@@ -181,14 +181,14 @@ spec:
             httpGet:
               path: /metrics
               port: metrics
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
+            initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }}
+            timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }}
           readinessProbe:
             httpGet:
               path: /metrics
               port: metrics
-            initialDelaySeconds: 5
-            timeoutSeconds: 1
+            initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }}
+            timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }}
           resources:
 {{ toYaml .Values.metrics.resources | indent 12 }}
 {{- end }}