Blackbox-exporter: Add support for affinity and tolerations (helm#8865)

Signed-off-by: Ergin Babani <[email protected]>
agolo · Nov 5, 2018 · 48f00c5 · 48f00c5
1 parent 77851ef
commit 48f00c5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git 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: 0.1.3
+version: 0.2.0
 appVersion: 0.12.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
@@ -60,6 +60,8 @@ The following table lists the configurable parameters of the Blackbox-Exporter c
 | `ingress.hosts`                        | Ingress accepted hostnames                      | None                          |
 | `ingress.tls`                          | Ingress TLS configuration                       | None                          |
 | `nodeSelector`                         | node labels for pod assignment                  | `{}`                          |
+| `tolerations`                          | node tolerations for pod assignment             | `[]`                          |
+| `affinity`                             | node affinity for pod assignment                | `{}`                          |
 | `podAnnotations`                       | annotations to add to each pod                  | `{}`                          |
 | `resources`                            | pod resource requests & limits                  | `{}`                          |
 | `restartPolicy`                        | container restart policy                        | `Always`                      |

diff --git a/stable/prometheus-blackbox-exporter/templates/deployment.yaml b/stable/prometheus-blackbox-exporter/templates/deployment.yaml
@@ -30,6 +30,15 @@ spec:
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
     {{- end }}
+    {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+    {{- end }}
+    {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 6 }}
+    {{- end }}
+
       restartPolicy: {{ .Values.restartPolicy }}
       containers:
         - name: blackbox-exporter

diff --git a/stable/prometheus-blackbox-exporter/values.yaml b/stable/prometheus-blackbox-exporter/values.yaml
@@ -6,6 +6,8 @@ image:
   pullPolicy: IfNotPresent
 
 nodeSelector: {}
+tolerations: []
+affinity: {}
 
 config:
   modules: