From 0edb616b9b59d87121418dd061280d380d7413e5 Mon Sep 17 00:00:00 2001 From: Hu Zhou Date: Fri, 17 Jan 2020 11:25:14 +0200 Subject: [PATCH] Add maintenance tolerations to caas-install Change-Id: Ie0b22bd4a52383b5c71057fce6ecd163c4537321 Signed-off-by: Hu Zhou --- SPECS/infra-charts.spec | 2 +- infra-charts/templates/custom-metrics-apiserver-deployment.yaml | 5 +++++ infra-charts/templates/elasticsearch-statefulset.yaml | 5 +++++ infra-charts/templates/metrics-server-deployment.yaml | 5 +++++ infra-charts/templates/prometheus-dep.yaml | 5 +++++ infra-charts/templates/sriovdp-ds.yaml | 5 +++++ 6 files changed, 26 insertions(+), 1 deletion(-) diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec index 95d601c..7c36b6c 100644 --- a/SPECS/infra-charts.spec +++ b/SPECS/infra-charts.spec @@ -15,7 +15,7 @@ %define COMPONENT infra-charts %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.0.0 -%define RPM_MINOR_VERSION 46 +%define RPM_MINOR_VERSION 47 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} diff --git a/infra-charts/templates/custom-metrics-apiserver-deployment.yaml b/infra-charts/templates/custom-metrics-apiserver-deployment.yaml index 21b35d8..71875ab 100644 --- a/infra-charts/templates/custom-metrics-apiserver-deployment.yaml +++ b/infra-charts/templates/custom-metrics-apiserver-deployment.yaml @@ -36,6 +36,11 @@ spec: priorityClassName: "system-cluster-critical" nodeSelector: nodetype: caas_master + tolerations: + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" serviceAccountName: custom-metrics-apiserver containers: - name: custom-metrics-apiserver diff --git a/infra-charts/templates/elasticsearch-statefulset.yaml b/infra-charts/templates/elasticsearch-statefulset.yaml index fd628b7..3c813ef 100644 --- a/infra-charts/templates/elasticsearch-statefulset.yaml +++ b/infra-charts/templates/elasticsearch-statefulset.yaml @@ -47,6 +47,11 @@ spec: component: "{{ .Values.elasticsearch.cluster.name }}" nodeSelector: nodetype: caas_master + tolerations: + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" containers: - name: elasticsearch env: diff --git a/infra-charts/templates/metrics-server-deployment.yaml b/infra-charts/templates/metrics-server-deployment.yaml index da601b7..ebcfac4 100644 --- a/infra-charts/templates/metrics-server-deployment.yaml +++ b/infra-charts/templates/metrics-server-deployment.yaml @@ -35,6 +35,11 @@ spec: priorityClassName: "system-cluster-critical" nodeSelector: nodetype: caas_master + tolerations: + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" serviceAccountName: metrics-apiserver containers: - name: metrics-server diff --git a/infra-charts/templates/prometheus-dep.yaml b/infra-charts/templates/prometheus-dep.yaml index 753edc5..546a39c 100644 --- a/infra-charts/templates/prometheus-dep.yaml +++ b/infra-charts/templates/prometheus-dep.yaml @@ -35,6 +35,11 @@ spec: priorityClassName: "system-cluster-critical" nodeSelector: nodetype: caas_master + tolerations: + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" serviceAccountName: prometheus containers: - name: prometheus diff --git a/infra-charts/templates/sriovdp-ds.yaml b/infra-charts/templates/sriovdp-ds.yaml index f581eca..df3098c 100644 --- a/infra-charts/templates/sriovdp-ds.yaml +++ b/infra-charts/templates/sriovdp-ds.yaml @@ -35,6 +35,11 @@ spec: hostNetwork: true nodeSelector: sriov: enabled + tolerations: + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" containers: - name: sriovdp image: {{ .Values.sriovdp.image_name }} -- 2.16.6