[stable/kube-state-metrics]: support toleration configuration (helm#4412

)
Eneco · Apr 9, 2018 · 1ed8c74 · 1ed8c74
1 parent c4a835a
commit 1ed8c74
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
 - metric
 - monitoring
 - prometheus
-version: 0.6.0
+version: 0.7.0
 appVersion: 1.2.0
 home: https://github.com/kubernetes/kube-state-metrics/
 sources:

diff --git a/stable/kube-state-metrics/README.md b/stable/kube-state-metrics/README.md
@@ -15,13 +15,14 @@ $ helm install stable/kube-state-metrics
 | Parameter                             | Description                                             | Default                                     |
 |---------------------------------------|---------------------------------------------------------|---------------------------------------------|
 | `image.repository`                    | The image repository to pull from                       | k8s.gcr.io/kube-state-metrics               |
-| `image.tag`                           | The image tag to pull from                              | <latest version>                            |
+| `image.tag`                           | The image tag to pull from                              | `<latest version>`                          |
 | `image.pullPolicy`                    | Image pull policy                                       | IfNotPresent                                |
 | `service.port`                        | The port of the container                               | 8080                                        |
 | `prometheusScrape`                    | Whether or not enable prom scrape                       | True                                        |
 | `rbac.create`                         | If true, create & use RBAC resources                    | False                                       |
 | `rbac.serviceAccountName`             | ServiceAccount to be used (ignored if rbac.create=true) | default                                     |
 | `nodeSelector`                        | Node labels for pod assignment                          | {}                                          |
+| `tolerations`                         | Tolerations for pod assignment	                      | []                                          |
 | `podAnnotations`                      | Annotations to be added to the pod                      | {}                                          |
 | `resources`                           | kube-state-metrics resource requests and limits         | {}                                          |
 | `collectors.cronjobs`                 | Enable the cronjobs collector.                          | true                                        |

diff --git a/stable/kube-state-metrics/templates/deployment.yaml b/stable/kube-state-metrics/templates/deployment.yaml
@@ -89,8 +89,12 @@ spec:
           timeoutSeconds: 5
         resources:
 {{ toYaml .Values.resources | indent 12 }}
-    {{- if .Values.nodeSelector }}
+{{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
-    {{- end }}
+{{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+{{- end }}
 
diff --git a/stable/kube-state-metrics/values.yaml b/stable/kube-state-metrics/values.yaml
@@ -20,6 +20,10 @@ rbac:
 ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
 nodeSelector: {}
 
+## Tolerations for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+tolerations: []
+
 # Annotations to be added to the pod
 podAnnotations: {}