Skip to content
Snippets Groups Projects
Unverified Commit 7ff8fc25 authored by Flavien's avatar Flavien Committed by GitHub
Browse files

Support all taints in network plugins manifests (#6208)

flannel, ovn and multus network plugins did not support all taint keys. This
update changes the tolerations to support them all.

According to the documentation:

```
There are two special cases: An empty key with operator Exists matches all keys,
values and effects which means this will tolerate everything. An empty effect matches
all effects with key key.
```

Usage of the empty `key` and `effect` ensures the network plugin daemonset will
be deployed on every nodes (ex: in case of custom taints, or NoExecute effect)
parent cc507d7a
No related branches found
No related tags found
No related merge requests found
...@@ -29,13 +29,7 @@ spec: ...@@ -29,13 +29,7 @@ spec:
hostNetwork: true hostNetwork: true
serviceAccountName: calico-node serviceAccountName: calico-node
tolerations: tolerations:
- effect: NoExecute - operator: Exists
operator: Exists
- effect: NoSchedule
operator: Exists
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)
- key: CriticalAddonsOnly
operator: "Exists"
# Minimize downtime during a rolling upgrade or deletion; tell Kubernetes to do a "force # Minimize downtime during a rolling upgrade or deletion; tell Kubernetes to do a "force
# deletion": https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods. # deletion": https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods.
terminationGracePeriodSeconds: 0 terminationGracePeriodSeconds: 0
......
...@@ -120,7 +120,6 @@ spec: ...@@ -120,7 +120,6 @@ spec:
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
tolerations: tolerations:
- operator: Exists - operator: Exists
effect: NoSchedule
volumes: volumes:
- name: run - name: run
hostPath: hostPath:
......
...@@ -99,7 +99,6 @@ spec: ...@@ -99,7 +99,6 @@ spec:
spec: spec:
tolerations: tolerations:
- operator: Exists - operator: Exists
effect: NoSchedule
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
serviceAccountName: ovn serviceAccountName: ovn
hostNetwork: true hostNetwork: true
...@@ -211,7 +210,6 @@ spec: ...@@ -211,7 +210,6 @@ spec:
spec: spec:
tolerations: tolerations:
- operator: Exists - operator: Exists
effect: NoSchedule
serviceAccountName: ovn serviceAccountName: ovn
hostPID: true hostPID: true
containers: containers:
......
...@@ -23,9 +23,7 @@ spec: ...@@ -23,9 +23,7 @@ spec:
nodeSelector: nodeSelector:
kubernetes.io/arch: amd64 kubernetes.io/arch: amd64
tolerations: tolerations:
- key: node-role.kubernetes.io/master - operator: Exists
operator: Exists
effect: NoSchedule
serviceAccountName: multus serviceAccountName: multus
containers: containers:
- name: kube-multus - name: kube-multus
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment