mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/datadog] Support 1.6 tolerations (#1252)
* [stable/datadog] Support 1.6 tolerations This allows the Datadog DaemonSet to run on tainted nodes, whether that's a master provisioned by kubeadm (see #1100): tolerations: - effect: NoSchedule key: node-role.kubernetes.io/master or any "dedicated" node: tolerations: - effect: NoSchedule operator: Exists * [stable/datadog] Document 1.6 requirement for `tolerations` * [stable/datadog] Add `daemonset.podAnnotations` value This allows Kubernetes 1.5 users to use the alpha tolerations annotation to schedule DataDog Pods on tainted nodes. * [stable/datadog] Docs tweak: greater than 1.6 * [stable/datadog] Docs tweak: >= 1.6
This commit is contained in:
committed by
Reinhard Nägele
parent
c7db6fcc33
commit
ef895a0cb6
@@ -1,5 +1,5 @@
|
||||
name: datadog
|
||||
version: 0.5.0
|
||||
version: 0.6.0
|
||||
description: DataDog Agent
|
||||
keywords:
|
||||
- monitoring
|
||||
|
||||
@@ -53,6 +53,8 @@ The following tables lists the configurable parameters of the Datadog chart and
|
||||
| `resources.limits.cpu` | CPU resource limits | 512Mi |
|
||||
| `resources.requests.memory` | Memory resource requests | 100m |
|
||||
| `resources.limits.memory` | Memory resource limits | 256m |
|
||||
| `daemonset.podAnnotations` | Annotations to add to the DaemonSet's Pods | `nil` |
|
||||
| `daemonset.tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `nil` |
|
||||
|
||||
|
||||
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
|
||||
|
||||
@@ -12,6 +12,10 @@ spec:
|
||||
labels:
|
||||
app: {{ template "fullname" . }}
|
||||
name: {{ template "fullname" . }}
|
||||
{{- if .Values.daemonset.podAnnotations }}
|
||||
annotations:
|
||||
{{ toYaml .Values.daemonset.podAnnotations | indent 8 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}
|
||||
@@ -89,5 +93,9 @@ spec:
|
||||
- name: autoconf
|
||||
configMap:
|
||||
name: {{ template "autoconf.fullname" . }}
|
||||
{{- if .Values.daemonset.tolerations }}
|
||||
tolerations:
|
||||
{{ toYaml .Values.daemonset.tolerations | indent 8 }}
|
||||
{{- end }}
|
||||
{{ end }}
|
||||
{{ end }}
|
||||
|
||||
@@ -13,6 +13,13 @@ image:
|
||||
daemonset:
|
||||
enabled: true
|
||||
|
||||
## Annotations to add to the DaemonSet's Pods
|
||||
# podAnnotations:
|
||||
# scheduler.alpha.kubernetes.io/tolerations: '[{"key": "example", "value": "foo"}]'
|
||||
|
||||
## Allow the DaemonSet to schedule on tainted nodes (requires Kubernetes >= 1.6)
|
||||
# tolerations: []
|
||||
|
||||
# Apart from DaemonSet, deploy Datadog agent pods and related service for
|
||||
# applications that want to send custom metrics. Provides DogStasD service.
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user