From: Hu Zhou <hu.zhou@nokia.com>
Date: Mon, 20 Jan 2020 08:15:38 +0000 (+0200)
Subject: Add maintenance toleration to caas-install
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F2203%2F3;p=ta%2Fcaas-install.git

Add maintenance toleration to caas-install

Change-Id: I74742ff62a0606b4e064f687ef9d6c65eedb5420
Signed-off-by: Hu Zhou <hu.zhou@nokia.com>
---

diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec
index 7c36b6c..a3e4200 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 47
+%define RPM_MINOR_VERSION 48
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
diff --git a/infra-charts/templates/cpu-deviceplugin-daemonset.yaml b/infra-charts/templates/cpu-deviceplugin-daemonset.yaml
index ef8a7aa..2974464 100644
--- a/infra-charts/templates/cpu-deviceplugin-daemonset.yaml
+++ b/infra-charts/templates/cpu-deviceplugin-daemonset.yaml
@@ -32,6 +32,11 @@ spec:
         {{ .Values.kubernetes_component_label }}: cpu-device-plugin
     spec:
       priorityClassName: "system-node-critical"
+      tolerations:
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       containers:
       - name: cpu-device-plugin
         image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/cpupooler:{{ .Values.cpupooler.container_version }}
diff --git a/infra-charts/templates/cpu-setter-daemonset.yaml b/infra-charts/templates/cpu-setter-daemonset.yaml
index f026bbd..6e998f3 100644
--- a/infra-charts/templates/cpu-setter-daemonset.yaml
+++ b/infra-charts/templates/cpu-setter-daemonset.yaml
@@ -32,6 +32,11 @@ spec:
         {{ .Values.kubernetes_component_label }}: cpu-setter
     spec:
       priorityClassName: "system-node-critical"
+      tolerations:
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       containers:
       - name: cpu-setter
         image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/cpupooler:{{ .Values.cpupooler.container_version }}
diff --git a/infra-charts/templates/danm-webhook-ds.yaml b/infra-charts/templates/danm-webhook-ds.yaml
index 64d63f4..d6b486b 100644
--- a/infra-charts/templates/danm-webhook-ds.yaml
+++ b/infra-charts/templates/danm-webhook-ds.yaml
@@ -35,6 +35,11 @@ spec:
       serviceAccountName: danm-webhook
       nodeSelector:
         nodetype: caas_master
+      tolerations:
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       containers:
         - name: danm-webhook
           image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/hyperdanm:{{ .Values.danm_webhook.container_version }}
diff --git a/infra-charts/templates/dynamic-local-pv-provisioner.yaml b/infra-charts/templates/dynamic-local-pv-provisioner.yaml
index 5772255..39a2921 100644
--- a/infra-charts/templates/dynamic-local-pv-provisioner.yaml
+++ b/infra-charts/templates/dynamic-local-pv-provisioner.yaml
@@ -51,5 +51,10 @@ spec:
             path: /etc/localtime
       nodeSelector:
         nodetype: caas_master
+      tolerations:
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       serviceAccountName: dynamic-pv
 {{ end }}
diff --git a/infra-charts/templates/fluentd-daemonset.yaml b/infra-charts/templates/fluentd-daemonset.yaml
index b8e41a1..5b1bc60 100644
--- a/infra-charts/templates/fluentd-daemonset.yaml
+++ b/infra-charts/templates/fluentd-daemonset.yaml
@@ -109,3 +109,8 @@ spec:
         hostPath:
           path: /var/lib/fluentd
       serviceAccountName: fluentd
+      tolerations:
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
diff --git a/infra-charts/templates/webhook-deployment.yaml b/infra-charts/templates/webhook-deployment.yaml
index eabd01d..6579bbc 100644
--- a/infra-charts/templates/webhook-deployment.yaml
+++ b/infra-charts/templates/webhook-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"
       containers:
         - name: cpu-dev-pod-mutator
           image: {{ .Values.registry_url }}/{{ .Values.registry_reponame }}/cpupooler:{{ .Values.cpupooler.container_version }}