From 11a60b8868c81db8d856e32634da1b79596c7538 Mon Sep 17 00:00:00 2001
From: michelia feng <michelia.feng@gmail.com>
Date: Fri, 23 Aug 2019 14:18:23 +0800
Subject: [PATCH] Added linux node tolerations

---
 .../charts/alertmanager/templates/alertmanager.yaml   |  3 ++-
 .../exporter-kube-state/templates/deployment.yaml     |  3 ++-
 .../v0.0.4/charts/grafana/templates/deployment.yaml   |  3 ++-
 .../v0.0.4/charts/operator/templates/deployment.yaml  |  3 ++-
 .../charts/prometheus/templates/prometheus.yaml       |  3 ++-
 .../rancher-monitoring/v0.0.4/templates/_helpers.tpl  | 11 +++++++++++
 6 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/charts/rancher-monitoring/v0.0.4/charts/alertmanager/templates/alertmanager.yaml b/charts/rancher-monitoring/v0.0.4/charts/alertmanager/templates/alertmanager.yaml
index 68d15bb..0821f96 100644
--- a/charts/rancher-monitoring/v0.0.4/charts/alertmanager/templates/alertmanager.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/alertmanager/templates/alertmanager.yaml
@@ -75,7 +75,8 @@ spec:
             matchLabels:
               app: {{ template "app.name" . }}
               alertmanager: {{ .Release.Name }}
-{{- if .Values.tolerations }}
   tolerations:
+{{- include "linux-node-tolerations" . | nindent 8 }}
+{{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | indent 4 }}
 {{- end }}
diff --git a/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/deployment.yaml b/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/deployment.yaml
index b70d4d7..853209d 100644
--- a/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/deployment.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/deployment.yaml
@@ -50,8 +50,9 @@ spec:
       securityContext:
 {{ toYaml .Values.securityContext | indent 8 }}
       {{- end }}
-      {{- if .Values.tolerations }}
       tolerations:
+{{- include "linux-node-tolerations" . | nindent 8}}
+      {{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | indent 8 }}
       {{- end }}
       nodeSelector:
diff --git a/charts/rancher-monitoring/v0.0.4/charts/grafana/templates/deployment.yaml b/charts/rancher-monitoring/v0.0.4/charts/grafana/templates/deployment.yaml
index fb992b7..c9c644d 100755
--- a/charts/rancher-monitoring/v0.0.4/charts/grafana/templates/deployment.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/grafana/templates/deployment.yaml
@@ -123,8 +123,9 @@ spec:
     {{- if .Values.enabledRBAC }}
       serviceAccountName: {{ default (default (include "app.fullname" .) .Values.serviceAccountName) .Values.serviceAccountNameOverride }}
     {{- end }}
-    {{- if .Values.tolerations }}
       tolerations:
+{{- include "linux-node-tolerations" . | nindent 8 }}
+    {{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | indent 8 }}
     {{- end }}
       securityContext:
diff --git a/charts/rancher-monitoring/v0.0.4/charts/operator/templates/deployment.yaml b/charts/rancher-monitoring/v0.0.4/charts/operator/templates/deployment.yaml
index 5e02003..fbfc362 100644
--- a/charts/rancher-monitoring/v0.0.4/charts/operator/templates/deployment.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/operator/templates/deployment.yaml
@@ -69,7 +69,8 @@ spec:
       {{- if .Values.enabledRBAC }}
       serviceAccountName: {{ default (include "app.fullname" .) .Values.serviceAccountName }}
       {{- end }}
-      {{- if .Values.tolerations }}
       tolerations:
+{{- include "linux-node-tolerations" . | nindent 8 }}
+      {{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | indent 8 }}
       {{- end }}
diff --git a/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/prometheus.yaml b/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/prometheus.yaml
index 5105187..8a40740 100755
--- a/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/prometheus.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/prometheus.yaml
@@ -182,8 +182,9 @@ spec:
             matchLabels:
               app: {{ template "app.name" . }}
               prometheus: {{ .Release.Name }}
-{{- if .Values.tolerations }}
   tolerations:
+{{- include "linux-node-tolerations" . | nindent 4}}
+{{- if .Values.tolerations }}
 {{ toYaml .Values.tolerations | indent 4 }}
 {{- end }}
 {{- if (include "additional-scrape-configs.yaml" .) }}
diff --git a/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl b/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl
index 31dfb4b..99ca862 100644
--- a/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl
+++ b/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl
@@ -126,3 +126,14 @@
 {{- "" -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Windows cluster will add default taint for linux nodes, 
+add below linux tolerations to workloads could be scheduled to those linux nodes
+*/}}
+{{- define "linux-node-tolerations" -}}
+- key: "cattle.io/os"
+  value: "linux"
+  effect: "NoSchedule"
+  operator: "Equal"
+{{- end -}}
\ No newline at end of file
-- 
GitLab