From f0ade143a200b111d4816a379b7aa002fe758c25 Mon Sep 17 00:00:00 2001
From: Thiago Caiubi <thiago.caiubi@gmail.com>
Date: Tue, 17 Sep 2019 11:02:26 -0300
Subject: [PATCH] Allow the DaemonSet to schedule ussing affinity rules
 (#17180)

Heavily inspired by
https://github.com/helm/charts/blob/master/stable/signalsciences.

Signed-off-by: Thiago Caiubi <thiago.caiubi@gmail.com>
---
 stable/sysdig/CHANGELOG.md             | 6 ++++++
 stable/sysdig/Chart.yaml               | 2 +-
 stable/sysdig/README.md                | 1 +
 stable/sysdig/templates/daemonset.yaml | 4 ++++
 stable/sysdig/values.yaml              | 3 +++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/stable/sysdig/CHANGELOG.md b/stable/sysdig/CHANGELOG.md
index df754ad8ce..7d79b2293e 100644
--- a/stable/sysdig/CHANGELOG.md
+++ b/stable/sysdig/CHANGELOG.md
@@ -3,6 +3,12 @@
 This file documents all notable changes to Sysdig Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v1.4.16
+
+### Minor changes
+
+* Allow the DaemonSet to schedule using affinity rules
+
 ## v1.4.15
 
 ### Minor changes
diff --git a/stable/sysdig/Chart.yaml b/stable/sysdig/Chart.yaml
index d0c11de537..3303666912 100755
--- a/stable/sysdig/Chart.yaml
+++ b/stable/sysdig/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sysdig
-version: 1.4.15
+version: 1.4.16
 appVersion: 0.92.1
 description: Sysdig Monitor and Secure agent
 keywords:
diff --git a/stable/sysdig/README.md b/stable/sysdig/README.md
index 6e93f273f1..dcbb6b754f 100644
--- a/stable/sysdig/README.md
+++ b/stable/sysdig/README.md
@@ -52,6 +52,7 @@ The following table lists the configurable parameters of the Sysdig chart and th
 | `serviceAccount.create`         | Create serviceAccount                                                  | `true`                                      |
 | `serviceAccount.name`           | Use this value as serviceAccountName                                   | ` `                                         |
 | `daemonset.updateStrategy.type` | The updateStrategy for updating the daemonset                          | `RollingUpdate`                             |
+| `daemonset.affinity`            | Node affinities                                                        | `nil`                                       |
 | `ebpf.enabled`                  | Enable eBPF support for Sysdig instead of `sysdig-probe` kernel module | `false`                                     |
 | `ebpf.settings.mountEtcVolume`  | Needed to detect which kernel version are running in Google COS        | `true`                                      |
 | `sysdig.accessKey`              | Your Sysdig Monitor Access Key                                         | `Nil` You must provide your own key         |
diff --git a/stable/sysdig/templates/daemonset.yaml b/stable/sysdig/templates/daemonset.yaml
index a576c287ae..00b2bf3c46 100644
--- a/stable/sysdig/templates/daemonset.yaml
+++ b/stable/sysdig/templates/daemonset.yaml
@@ -26,6 +26,10 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       hostPID: true
       terminationGracePeriodSeconds: 5
+      {{- if .Values.daemonset.affinity }}
+      affinity:
+{{ toYaml .Values.daemonset.affinity | indent 8 }}
+      {{- end }}
       {{- if .Values.image.pullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.image.pullSecrets | indent 8 }}
diff --git a/stable/sysdig/values.yaml b/stable/sysdig/values.yaml
index 6d2155b604..b80599471a 100644
--- a/stable/sysdig/values.yaml
+++ b/stable/sysdig/values.yaml
@@ -45,6 +45,9 @@ daemonset:
     type: RollingUpdate
   ## Extra environment variables that will be pass onto deployment pods
   env: {}
+  ## Allow the DaemonSet to schedule using affinity rules
+  # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  # affinity: {}
 
 # If is behind a proxy you can set the proxy server
 proxy: