From fd3887cafed5ca0a299e387eb4ce1e7f370ad581 Mon Sep 17 00:00:00 2001 From: Sven Nebel Date: Thu, 7 Jun 2018 15:37:23 +0100 Subject: [PATCH] [stable/datadog] Add nodeSelector and affinity values for daemonset (#4928) * [stable/datadog] Add nodeSelector and affinity values * [stable/datadog] Delete duplicated nodeSelector block * [stable/datadog] Add links for node affinity/selection --- stable/datadog/Chart.yaml | 2 +- stable/datadog/README.md | 3 ++- stable/datadog/templates/daemonset.yaml | 4 ++++ stable/datadog/values.yaml | 8 ++++++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index c7ac81ca05..0fbe5d89da 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,5 +1,5 @@ name: datadog -version: 0.14.0 +version: 0.15.0 appVersion: 6.2.1 description: DataDog Agent keywords: diff --git a/stable/datadog/README.md b/stable/datadog/README.md index 65765df953..8fa5b91111 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -59,9 +59,10 @@ The following table lists the configurable parameters of the Datadog chart and t | `kubeStateMetrics.enabled` | If true, create kube-state-metrics | `true` | | `daemonset.podAnnotations` | Annotations to add to the DaemonSet's Pods | `nil` | | `daemonset.tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `nil` | +| `daemonset.nodeSelector` | Node selectors | `nil` | +| `daemonset.affinity` | Node affinities | `nil` | | `daemonset.useHostNetwork` | If true, use the host's network | `nil` | | `daemonset.useHostPort` | If true, use the same ports for both host and container | `nil` | -| `daemonset.nodeSelector` | Node labels for pod assignment | `{}` | | `datadog.leaderElection` | Adds the leader Election feature | `false` | | `datadog.leaderLeaseDuration`| The duration for which a leader stays elected.| `nil` | | `deployment.affinity` | Node / Pod affinities | `{}` | diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 9e0dd3f846..49a3cd3e59 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/stable/datadog/templates/daemonset.yaml @@ -168,6 +168,10 @@ spec: {{- if .Values.daemonset.tolerations }} tolerations: {{ toYaml .Values.daemonset.tolerations | indent 8 }} + {{- end }} + {{- if .Values.daemonset.affinity }} + affinity: +{{ toYaml .Values.daemonset.affinity | indent 8 }} {{- end }} serviceAccountName: {{ if .Values.rbac.create }}{{ template "datadog.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }} {{- if .Values.daemonset.nodeSelector }} diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index fd288902bb..53c63010a9 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -36,9 +36,13 @@ daemonset: ## Allow the DaemonSet to schedule on tainted nodes (requires Kubernetes >= 1.6) # tolerations: [] - # Node labels for pod assignment + ## Allow the DaemonSet to schedule on selected nodes # Ref: https://kubernetes.io/docs/user-guide/node-selection/ - nodeSelector: {} + # nodeSelector: {} + + ## Allow the DaemonSet to schedule ussing affinity rules + # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + # affinity: {} ## Allow the DaemonSet to perform a rolling update on helm update ## ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/