From 989ee29805c7509be782ff461bd5e0d152881ea0 Mon Sep 17 00:00:00 2001 From: Alan Tang Date: Wed, 2 Oct 2019 23:19:09 +0800 Subject: [PATCH] [stable/prometheus-to-sd] Add tolerations support for prometheus-to-sd (#17615) Signed-off-by: Alan Tang --- stable/prometheus-to-sd/Chart.yaml | 2 +- stable/prometheus-to-sd/README.md | 1 + stable/prometheus-to-sd/templates/deployment.yaml | 4 ++++ stable/prometheus-to-sd/values.yaml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/prometheus-to-sd/Chart.yaml b/stable/prometheus-to-sd/Chart.yaml index 7e8bda1426..707e96ca30 100644 --- a/stable/prometheus-to-sd/Chart.yaml +++ b/stable/prometheus-to-sd/Chart.yaml @@ -9,4 +9,4 @@ maintainers: - name: acondrat email: arcadie.condrat@gmail.com name: prometheus-to-sd -version: 0.2.0 +version: 0.3.0 diff --git a/stable/prometheus-to-sd/README.md b/stable/prometheus-to-sd/README.md index 960aaa3a75..60f080b53b 100644 --- a/stable/prometheus-to-sd/README.md +++ b/stable/prometheus-to-sd/README.md @@ -47,6 +47,7 @@ The following table lists the configurable parameters and their default values. | `port` | Profiler port | `6060` | | `metricSources` | Sources for metrics in the next format: component-name:http://host:port?whitelisted=a,b,c | `{"kube-state-metrics": "http://kube-state-metrics:8080"}` | | `nodeSelector` | node labels for pod assignment | `{}` | +| `tolerations` | tolerations for node taints | `[]` | For more information please refer to the [prometheus-to-sd](https://github.com/GoogleCloudPlatform/k8s-stackdriver/tree/master/prometheus-to-sd) documentation. diff --git a/stable/prometheus-to-sd/templates/deployment.yaml b/stable/prometheus-to-sd/templates/deployment.yaml index 8e1523339b..1bb4773ec4 100644 --- a/stable/prometheus-to-sd/templates/deployment.yaml +++ b/stable/prometheus-to-sd/templates/deployment.yaml @@ -34,3 +34,7 @@ spec: nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/stable/prometheus-to-sd/values.yaml b/stable/prometheus-to-sd/values.yaml index 364bfd1c36..187a48b125 100644 --- a/stable/prometheus-to-sd/values.yaml +++ b/stable/prometheus-to-sd/values.yaml @@ -8,3 +8,4 @@ port: 6060 metricsSources: kube-state-metrics: http://kube-state-metrics:8080 nodeSelector: {} +tolerations: []