From 573182a5721498bfdf87f3b24c82ffef151a0058 Mon Sep 17 00:00:00 2001 From: Hu Zhou Date: Fri, 17 Jan 2020 09:28:50 +0200 Subject: [PATCH] Add maintenance toleration for kubedns Change-Id: I5574fdb96c3f59e4a0227c7dc1bd9db7012e6912 Signed-off-by: Hu Zhou --- ansible/roles/kubedns/templates/kubedns-deployment.yml | 4 ++++ rpmbuild.spec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ansible/roles/kubedns/templates/kubedns-deployment.yml b/ansible/roles/kubedns/templates/kubedns-deployment.yml index 265295d..65a25ff 100644 --- a/ansible/roles/kubedns/templates/kubedns-deployment.yml +++ b/ansible/roles/kubedns/templates/kubedns-deployment.yml @@ -42,6 +42,10 @@ spec: tolerations: - key: "CriticalAddonsOnly" operator: "Exists" + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" volumes: - name: time-mount hostPath: diff --git a/rpmbuild.spec b/rpmbuild.spec index e6f6ca9..a78c08a 100644 --- a/rpmbuild.spec +++ b/rpmbuild.spec @@ -15,7 +15,7 @@ %define COMPONENT kubedns %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 1.15.7 -%define RPM_MINOR_VERSION 0 +%define RPM_MINOR_VERSION 1 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define go_version 1.12.10 -- 2.16.6