From 41775563e7de0d63c2d12be1a1a130f0fb9c9e4d Mon Sep 17 00:00:00 2001 From: michelia feng Date: Tue, 27 Aug 2019 16:24:32 +0800 Subject: [PATCH] Improve linux node selector and tolerations Problem: New add charts operator-init lack of linux node selector and tolerations Solution: Improve node selector and tolerations --- .../charts/alertmanager/templates/alertmanager.yaml | 2 +- .../exporter-kube-state/templates/deployment.yaml | 2 +- .../charts/exporter-node/templates/daemonset.yaml | 2 +- .../v0.0.4/charts/grafana/templates/deployment.yaml | 2 +- .../operator-init/templates/job-install-crds.yaml | 4 ++++ .../v0.0.4/charts/operator/templates/deployment.yaml | 2 +- .../v0.0.4/charts/prometheus/templates/prometheus.yaml | 2 +- .../rancher-monitoring/v0.0.4/templates/_helpers.tpl | 10 +++++++++- 8 files changed, 19 insertions(+), 7 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 0821f96..0b2239b 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 @@ -19,7 +19,7 @@ spec: release: {{ .Release.Name }} baseImage: {{ template "system_default_registry" . }}{{ .Values.image.repository }} nodeSelector: - beta.kubernetes.io/os: linux +{{- include "linux-node-selector" . | nindent 4 }} {{- range .Values.nodeSelectors }} {{- $pair := regexSplit "=" . 2 }} {{- if eq 2 (len $pair) }} 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 853209d..fe764c9 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 @@ -56,7 +56,7 @@ spec: {{ toYaml .Values.tolerations | indent 8 }} {{- end }} nodeSelector: - beta.kubernetes.io/os: linux +{{- include "linux-node-selector" . | nindent 8 }} {{- range .Values.nodeSelectors }} {{- $pair := regexSplit "=" . 2 }} {{- if eq 2 (len $pair) }} diff --git a/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/daemonset.yaml b/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/daemonset.yaml index a9a2004..f3600fe 100755 --- a/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/daemonset.yaml +++ b/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/daemonset.yaml @@ -73,7 +73,7 @@ spec: tolerations: - operator: Exists nodeSelector: - beta.kubernetes.io/os: linux +{{- include "linux-node-selector" . | nindent 8 }} {{- range .Values.nodeSelectors }} {{- $pair := regexSplit "=" . 2 }} {{- if eq 2 (len $pair) }} 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 c9c644d..688ff05 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 @@ -111,7 +111,7 @@ spec: {{ toYaml .Values.resources.proxy | indent 10 }} {{- end }} nodeSelector: - beta.kubernetes.io/os: linux +{{- include "linux-node-selector" . | nindent 8 }} {{- range .Values.nodeSelectors }} {{- $pair := regexSplit "=" . 2 }} {{- if eq 2 (len $pair) }} diff --git a/charts/rancher-monitoring/v0.0.4/charts/operator-init/templates/job-install-crds.yaml b/charts/rancher-monitoring/v0.0.4/charts/operator-init/templates/job-install-crds.yaml index 1902739..0d1a738 100644 --- a/charts/rancher-monitoring/v0.0.4/charts/operator-init/templates/job-install-crds.yaml +++ b/charts/rancher-monitoring/v0.0.4/charts/operator-init/templates/job-install-crds.yaml @@ -11,6 +11,10 @@ spec: backoffLimit: 3 template: spec: + nodeSelector: +{{- include "linux-node-selector" . | nindent 8 }} + tolerations: +{{- include "linux-node-tolerations" . | nindent 8}} serviceAccountName: {{ template "app.fullname" . }} containers: - name: operator-init-crds 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 fbfc362..e036572 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 @@ -57,7 +57,7 @@ spec: resources: {{ toYaml .Values.resources | indent 12 }} nodeSelector: - beta.kubernetes.io/os: linux +{{- include "linux-node-selector" . | nindent 8 }} {{- range .Values.nodeSelectors }} {{- $pair := regexSplit "=" . 2 }} {{- if eq 2 (len $pair) }} 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 8a40740..ff43c19 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 @@ -109,7 +109,7 @@ spec: {{- end }} {{- end }} nodeSelector: - beta.kubernetes.io/os: linux +{{- include "linux-node-selector" . | nindent 4 }} {{- range .Values.nodeSelectors }} {{- $pair := regexSplit "=" . 2 }} {{- if eq 2 (len $pair) }} diff --git a/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl b/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl index 99ca862..bf05a61 100644 --- a/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl +++ b/charts/rancher-monitoring/v0.0.4/templates/_helpers.tpl @@ -136,4 +136,12 @@ add below linux tolerations to workloads could be scheduled to those linux nodes value: "linux" effect: "NoSchedule" operator: "Equal" -{{- end -}} \ No newline at end of file +{{- end -}} + +{{- define "linux-node-selector" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +beta.kubernetes.io/os: linux +{{- else -}} +kubernetes.io/os: linux +{{- end -}} +{{- end -}} -- GitLab