Merge pull request #2103 from zshi-redhat/OCPBUGS-19830

OCPBUGS-19830: fix whereabouts conformance test failures

Author: openshift-merge-bot[bot]

bindata/network/multus/multus.yaml

@@ -705,8 +705,12 @@ spec:
       name: whereabouts-reconciler
   updateStrategy:
     type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 10%
   template:
     metadata:
+      annotations:
+        target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
       labels:
         app: whereabouts-reconciler
         name: whereabouts-reconciler
@@ -715,6 +719,7 @@ spec:
       nodeSelector:
         kubernetes.io/os: linux
       serviceAccountName: multus-ancillary-tools
+      priorityClassName: "system-node-critical"
       tolerations:
       - operator: Exists
         effect: NoSchedule
@@ -735,9 +740,6 @@ spec:
           requests:
             cpu: "50m"
             memory: "50Mi"
-          limits:
-            cpu: "50m"
-            memory: "100Mi"
         volumeMounts:
           - name: cni-net-dir
             mountPath: /host/etc/cni/net.d