diff --git a/stable/mongodb/Chart.yaml b/stable/mongodb/Chart.yaml index 1bdcfa103e..80a258f682 100644 --- a/stable/mongodb/Chart.yaml +++ b/stable/mongodb/Chart.yaml @@ -1,5 +1,5 @@ name: mongodb -version: 5.6.0 +version: 5.6.1 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 index 9670845883..f779bcf602 100644 --- a/stable/mongodb/README.md +++ b/stable/mongodb/README.md @@ -95,11 +95,13 @@ The following table lists the configurable parameters of the MongoDB chart and t | `persistence.size` | Size of data volume | `8Gi` | | `persistence.annotations` | Persistent Volume annotations | `{}` | | `persistence.existingClaim` | Name of an existing PVC to use (avoids creating one if this is given) | `nil` | +| `livenessProbe.enabled` | Enable/disable the Liveness probe | `true` | | `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `30` | | `livenessProbe.periodSeconds` | How often to perform the probe | `10` | | `livenessProbe.timeoutSeconds` | When the probe times out | `5` | | `livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` | | `livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `6` | +| `readinessProbe.enabled` | Enable/disable the Readiness probe | `true` | | `readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | `5` | | `readinessProbe.periodSeconds` | How often to perform the probe | `10` | | `readinessProbe.timeoutSeconds` | When the probe times out | `5` | @@ -120,10 +122,14 @@ 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 | +| `metrics.livenessProbe.enabled` | Enable/disable the Liveness Check of Prometheus metrics exporter | `false` | +| `metrics.livenessProbe.initialDelaySeconds` | Initial Delay for Liveness Check of Prometheus metrics exporter | `15` | +| `metrics.livenessProbe.periodSeconds` | How often to perform Liveness Check of Prometheus metrics exporter | `10` | +| `metrics.livenessProbe.timeoutSeconds` | Timeout for Liveness Check of Prometheus metrics exporter | `5` | +| `metrics.readinessProbe.enabled` | Enable/disable the Readiness Check of Prometheus metrics exporter | `false` | +| `metrics.readinessProbe.initialDelaySeconds` | Initial Delay for Readiness Check of Prometheus metrics exporter | `5` | +| `metrics.readinessProbe.periodSeconds` | How often to perform Readiness Check of Prometheus metrics exporter | `10` | +| `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/statefulset-secondary-rs.yaml b/stable/mongodb/templates/statefulset-secondary-rs.yaml index bdcc8fda9d..3ee8d327c8 100644 --- a/stable/mongodb/templates/statefulset-secondary-rs.yaml +++ b/stable/mongodb/templates/statefulset-secondary-rs.yaml @@ -177,18 +177,24 @@ spec: ports: - name: metrics containerPort: 9216 + {{- if .Values.metrics.livenessProbe.enabled }} livenessProbe: httpGet: path: /metrics port: metrics - initialDelaySeconds: {{ default 15 .Values.metrics.livenessProbe.initialDelaySeconds }} - timeoutSeconds: {{ default 5 .Values.metrics.livenessProbe.timeoutSeconds }} + initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.metrics.readinessProbe.enabled }} readinessProbe: httpGet: path: /metrics port: metrics - initialDelaySeconds: {{ default 5 .Values.metrics.readinessProbe.initialDelaySeconds }} - timeoutSeconds: {{ default 1 .Values.metrics.readinessProbe.timeoutSeconds }} + initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }} + {{- end }} resources: {{ toYaml .Values.metrics.resources | indent 12 }} {{- end }} diff --git a/stable/mongodb/values-production.yaml b/stable/mongodb/values-production.yaml index 5e12a5c8d8..b6bae91234 100644 --- a/stable/mongodb/values-production.yaml +++ b/stable/mongodb/values-production.yaml @@ -256,11 +256,25 @@ metrics: ## String with extra arguments to the metrics exporter ## ref: https://github.com/dcu/mongodb_exporter/blob/master/mongodb_exporter.go extraArgs: "" + ## Metrics exporter resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## # resources: {} + ## Metrics exporter liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes) + livenessProbe: + enabled: true + initialDelaySeconds: 15 + periodSeconds: 5 + timeoutSeconds: 5 + readinessProbe: + enabled: true + initialDelaySeconds: 5 + periodSeconds: 5 + timeoutSeconds: 1 + ## Metrics exporter pod Annotation podAnnotations: prometheus.io/scrape: "true" diff --git a/stable/mongodb/values.yaml b/stable/mongodb/values.yaml index d159b9e8c8..3b7b811423 100644 --- a/stable/mongodb/values.yaml +++ b/stable/mongodb/values.yaml @@ -256,11 +256,25 @@ metrics: ## String with extra arguments to the metrics exporter ## ref: https://github.com/dcu/mongodb_exporter/blob/master/mongodb_exporter.go extraArgs: "" + ## Metrics exporter resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ ## # resources: {} + ## Metrics exporter liveness and readiness probes + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes) + livenessProbe: + enabled: false + initialDelaySeconds: 15 + periodSeconds: 5 + timeoutSeconds: 5 + readinessProbe: + enabled: false + initialDelaySeconds: 5 + periodSeconds: 5 + timeoutSeconds: 1 + ## Metrics exporter pod Annotation podAnnotations: prometheus.io/scrape: "true"