From b71c8c665e7de2ef22e915cd2f173d680cd7636c Mon Sep 17 00:00:00 2001 From: LucasBoisserie Date: Thu, 14 May 2020 09:54:22 +0200 Subject: [PATCH] Add vars for liveness and readyness (#22201) Signed-off-by: LucasBoisserie --- stable/prometheus-blackbox-exporter/Chart.yaml | 2 +- stable/prometheus-blackbox-exporter/README.md | 2 ++ .../templates/daemonset.yaml | 8 ++------ .../templates/deployment.yaml | 8 ++------ stable/prometheus-blackbox-exporter/values.yaml | 10 ++++++++++ 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/stable/prometheus-blackbox-exporter/Chart.yaml b/stable/prometheus-blackbox-exporter/Chart.yaml index 49537b8fa1..068239b00b 100644 --- a/stable/prometheus-blackbox-exporter/Chart.yaml +++ b/stable/prometheus-blackbox-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Prometheus Blackbox Exporter name: prometheus-blackbox-exporter -version: 4.0.0 +version: 4.1.0 appVersion: 0.16.0 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/stable/prometheus-blackbox-exporter/README.md b/stable/prometheus-blackbox-exporter/README.md index 7f79931ad5..842c4d987a 100644 --- a/stable/prometheus-blackbox-exporter/README.md +++ b/stable/prometheus-blackbox-exporter/README.md @@ -69,6 +69,8 @@ The following table lists the configurable parameters of the Blackbox-Exporter c | `allowIcmp` | whether to enable ICMP probes, by giving the pods `CAP_NET_RAW` and running as root | `false` | | `resources` | pod resource requests & limits | `{}` | | `restartPolicy` | container restart policy | `Always` | +| `livenessProbe` | Container liveness probe | See values.yaml | +| `readinessProbe` | Container readiness probe | See values.yaml | | `service.annotations` | annotations for the service | `{}` | | `service.labels` | additional labels for the service | None | | `service.type` | type of service to create | `ClusterIP` | diff --git a/stable/prometheus-blackbox-exporter/templates/daemonset.yaml b/stable/prometheus-blackbox-exporter/templates/daemonset.yaml index 57fb904a00..651b2d30a3 100644 --- a/stable/prometheus-blackbox-exporter/templates/daemonset.yaml +++ b/stable/prometheus-blackbox-exporter/templates/daemonset.yaml @@ -77,13 +77,9 @@ spec: - containerPort: {{ .Values.service.port }} name: http livenessProbe: - httpGet: - path: /health - port: http + {{- toYaml .Values.livenessProbe | trim | nindent 12 }} readinessProbe: - httpGet: - path: /health - port: http + {{- toYaml .Values.readinessProbe | trim | nindent 12 }} volumeMounts: - mountPath: /config name: config diff --git a/stable/prometheus-blackbox-exporter/templates/deployment.yaml b/stable/prometheus-blackbox-exporter/templates/deployment.yaml index aa2ca28658..1814a0afa9 100644 --- a/stable/prometheus-blackbox-exporter/templates/deployment.yaml +++ b/stable/prometheus-blackbox-exporter/templates/deployment.yaml @@ -82,13 +82,9 @@ spec: - containerPort: {{ .Values.service.port }} name: http livenessProbe: - httpGet: - path: /health - port: http + {{- toYaml .Values.livenessProbe | trim | nindent 12 }} readinessProbe: - httpGet: - path: /health - port: http + {{- toYaml .Values.readinessProbe | trim | nindent 12 }} volumeMounts: - mountPath: /config name: config diff --git a/stable/prometheus-blackbox-exporter/values.yaml b/stable/prometheus-blackbox-exporter/values.yaml index 59c09551f9..e8488f6649 100644 --- a/stable/prometheus-blackbox-exporter/values.yaml +++ b/stable/prometheus-blackbox-exporter/values.yaml @@ -31,6 +31,16 @@ runAsUser: 1000 readOnlyRootFilesystem: true runAsNonRoot: true +livenessProbe: + httpGet: + path: /health + port: http + +readinessProbe: + httpGet: + path: /health + port: http + nodeSelector: {} tolerations: [] affinity: {}