Skip to content

Commit a4c6545

Browse files
committed
multus: Fix whereabouts tolerations for tainted nodes
Two issues were found with whereabouts toleration configuration: 1. The whereabouts-reconciler DaemonSet had `effect: NoSchedule` on its toleration, preventing pods from running on nodes with NoExecute or PreferNoSchedule taints. Removed the effect restriction to match all other Multus DaemonSets which use a catch-all `operator: Exists`. 2. The whereabouts-controller Deployment had no tolerations at all, causing the pod to not be scheduled when all worker nodes are tainted. Added `operator: Exists` toleration. Bug: https://redhat.atlassian.net/browse/OCPBUGS-77772 Signed-off-by: Saurab Sonigra <ssonigra@redhat.com>
1 parent d3ad345 commit a4c6545

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

‎bindata/network/multus/multus.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,6 @@ spec:
652652
priorityClassName: "system-node-critical"
653653
tolerations:
654654
- operator: Exists
655-
effect: NoSchedule
656655
containers:
657656
- name: whereabouts
658657
command: [ "/bin/sh" ]
@@ -752,6 +751,8 @@ spec:
752751
securityContext: {}
753752
serviceAccountName: multus-ancillary-tools
754753
terminationGracePeriodSeconds: 30
754+
tolerations:
755+
- operator: Exists
755756
volumes:
756757
- hostPath:
757758
path: {{ .CNIBinDir }}

0 commit comments

Comments
 (0)