From deb9980821d4202e9707da27e7fe447b06d9b67a Mon Sep 17 00:00:00 2001
From: Ivan Fitenko <digitalhunger@gmail.com>
Date: Thu, 7 Jun 2018 14:21:22 +0300
Subject: [PATCH] [stable/datadog] add configurable affinity and tolerations
 (#5383)

* [stable/datadog] add configurable affinity and tolerations

* [stable/datadog] increase chart version

* [stable/datadog] uncomment empty tolerations and affinity for deployment

* Update Chart.yaml
---
 stable/datadog/Chart.yaml                | 2 +-
 stable/datadog/README.md                 | 2 ++
 stable/datadog/templates/deployment.yaml | 8 ++++++++
 stable/datadog/values.yaml               | 6 ++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
index 94b422da02..c7ac81ca05 100755
--- a/stable/datadog/Chart.yaml
+++ b/stable/datadog/Chart.yaml
@@ -1,5 +1,5 @@
 name: datadog
-version: 0.13.1
+version: 0.14.0
 appVersion: 6.2.1
 description: DataDog Agent
 keywords:
diff --git a/stable/datadog/README.md b/stable/datadog/README.md
index 797bd89c11..65765df953 100644
--- a/stable/datadog/README.md
+++ b/stable/datadog/README.md
@@ -64,6 +64,8 @@ The following table lists the configurable parameters of the Datadog chart and t
 | `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              | `{}`                                      |
+| `deployment.tolerations`    | List of node taints to tolerate    | `[]`                                      |
 | `kube-state-metrics.rbac.create`| If true, create & use RBAC resources for kube-state-metrics | `true`       |
 | `kube-state-metrics.rbac.serviceAccount` | existing ServiceAccount to use (ignored if rbac.create=true) for kube-state-metrics | `default` |
 
diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml
index 7adc122142..b757a42285 100644
--- a/stable/datadog/templates/deployment.yaml
+++ b/stable/datadog/templates/deployment.yaml
@@ -135,6 +135,14 @@ spec:
 {{- if .Values.datadog.volumes }}
 {{ toYaml .Values.datadog.volumes | indent 8 }}
 {{- end }}
+      {{- if .Values.deployment.tolerations }}
+      tolerations:
+{{ toYaml .Values.deployment.tolerations | indent 8 }}
+      {{- end }}
+      {{- if .Values.deployment.affinity }}
+      affinity:
+{{ toYaml .Values.deployment.affinity | indent 8 }}
+      {{- end }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "datadog.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
 {{ end }}
 {{ end }}
diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml
index 2384eb0337..fd288902bb 100644
--- a/stable/datadog/values.yaml
+++ b/stable/datadog/values.yaml
@@ -51,6 +51,12 @@ daemonset:
 deployment:
   enabled: false
   replicas: 1
+  # Affinity for pod assignment
+  # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  affinity: {}
+  # Tolerations for pod assignment
+  # Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+  tolerations: []
 
 ## deploy the kube-state-metrics deployment
 ## ref: https://github.com/kubernetes/charts/tree/master/stable/kube-state-metrics