Skip to content

Commit

Permalink
weave: support any taint effect in daemonset tolerations (#6159)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
fydrah committed May 28, 2020
1 parent b2a0b64 commit ab44beb
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions roles/network_plugin/weave/templates/weave-net.yml.j2
Expand Up @@ -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:
Expand Down

0 comments on commit ab44beb

Please sign in to comment.