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 68d15bb8d20ed9b13ca8de4faa2cf03b7497e0b0..0821f964d0e2d3f6426bd132ea4298dda4fc753f 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 b70d4d7a4d6df09298ce90f51fbf334cc5b6d1ea..853209d8f634899dbdd90d98f82347737901f2c4 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 fb992b7e704818bbed4a25dbc33ea190606246ff..c9c644d8451fb29ce9c862fd07af8c5795d150c3 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 5e0200375a026268bc27748bcd215f3e29534b50..fbfc3628f4dc0bc65eb2725be157cfaa2f044b69 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 510518779da587c52b946d0190a7850545d770b1..8a40740d9ae56b3d8d907d15f64c60bdc3b1ffd9 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 31dfb4bf948166facb7704d8ea4f11e05de5b539..99ca862d929f6f11c0f9c558efe6f32990a20e74 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