From ca292613ad31df351edaa78bee60578a6e12c712 Mon Sep 17 00:00:00 2001
From: Niels Lensink <niels@we-riot.com>
Date: Thu, 24 Aug 2017 12:23:05 +0200
Subject: [PATCH] Added nodeselector and tolerations support for fluent-bit

---
 stable/fluent-bit/Chart.yaml               |  2 +-
 stable/fluent-bit/templates/daemonset.yaml |  8 ++++++++
 stable/fluent-bit/values.yaml              | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml
index 05984ae24474..88aa9cee38a3 100755
--- a/stable/fluent-bit/Chart.yaml
+++ b/stable/fluent-bit/Chart.yaml
@@ -1,5 +1,5 @@
 name: fluent-bit
-version: 0.1.6
+version: 0.1.7
 appVersion: 0.11.17
 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX
 keywords:
diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml
index 11083435409d..7ae48f7101a0 100644
--- a/stable/fluent-bit/templates/daemonset.yaml
+++ b/stable/fluent-bit/templates/daemonset.yaml
@@ -33,6 +33,14 @@ spec:
           readOnly: true
 {{ end }}
       terminationGracePeriodSeconds: 10
+    {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+    {{- end }}
+    {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+    {{- end }}
       volumes:
       - name: varlog
         hostPath:
diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml
index 467aeb5b2869..a2fd72a1c5ac 100644
--- a/stable/fluent-bit/values.yaml
+++ b/stable/fluent-bit/values.yaml
@@ -25,3 +25,17 @@ resources:
   requests:
     cpu: 100m
     memory: 100Mi
+
+## Node tolerations for fluent-bit scheduling to nodes with taints
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+##
+tolerations: []
+#- key: "key"
+#  operator: "Equal|Exists"
+#  value: "value"
+#  effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
+
+## Node labels for fluent-bit pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}