From ab44beba17b1f0590007575da2f085e087e86aba Mon Sep 17 00:00:00 2001
From: Flavien <flav.hardy@gmail.com>
Date: Thu, 28 May 2020 10:10:02 +0200
Subject: [PATCH] weave: support any taint effect in daemonset tolerations
(#6159)
Since weave 2.5.1, `NoExecute` taint effect is no more supported,
this changes the daemonset tolerations to change this behavior.
Also remove the toleration key `CriticalAddonsOnly` not required anymore.
---
roles/network_plugin/weave/templates/weave-net.yml.j2 | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/roles/network_plugin/weave/templates/weave-net.yml.j2 b/roles/network_plugin/weave/templates/weave-net.yml.j2
index 9c4f3b129..c9ac057a1 100644
--- a/roles/network_plugin/weave/templates/weave-net.yml.j2
+++ b/roles/network_plugin/weave/templates/weave-net.yml.j2
@@ -224,11 +224,7 @@ items:
seLinuxOptions: {}
serviceAccountName: weave-net
tolerations:
- - effect: NoSchedule
- operator: Exists
- # Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
- - key: CriticalAddonsOnly
- operator: "Exists"
+ - operator: Exists
volumes:
- name: weavedb
hostPath:
--
GitLab