From 77284be6364a55804a63299e362e80051e7c35eb Mon Sep 17 00:00:00 2001 From: Hu Zhou Date: Fri, 17 Jan 2020 11:22:15 +0200 Subject: [PATCH] Add maintenance toleration for flannel Change-Id: Ic210339e6a3a480f4eebaafd4045c6f9c9c15b87 Signed-off-by: Hu Zhou --- SPECS/caas-flannel.spec | 2 +- ansible/roles/flannel/templates/flannel-ds.yaml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec index 10c86e9..d4bb49c 100644 --- a/SPECS/caas-flannel.spec +++ b/SPECS/caas-flannel.spec @@ -15,7 +15,7 @@ %define COMPONENT flannel %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.11.0 -%define RPM_MINOR_VERSION 11 +%define RPM_MINOR_VERSION 12 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} Name: %{RPM_NAME} diff --git a/ansible/roles/flannel/templates/flannel-ds.yaml b/ansible/roles/flannel/templates/flannel-ds.yaml index 73881e6..e968fe9 100644 --- a/ansible/roles/flannel/templates/flannel-ds.yaml +++ b/ansible/roles/flannel/templates/flannel-ds.yaml @@ -43,6 +43,10 @@ spec: - key: node.kubernetes.io/master operator: Exists effect: NoSchedule + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" containers: - name: kube-flannel image: {{ container_image_names | select('search', '/flannel') | list | last }} -- 2.16.6