Add wildcard toleration to sriov CNI daemonsets

An issue was seen with a user specified taint having the effect
of preventing the sriov CNI pods from scheduling.

Since these plugins go hand-in-hand with the Multus CNI plugin,
this commit aligns with the tolerations of Multus.  That is, all
NoSchedule taints are tolerated.

Closes-Bug: #1838778

Change-Id: Iba7177b6e8a39e6713ea60d42c908dfd3d50ea8b
Signed-off-by: Steven Webster <steven.webster@windriver.com>
This commit is contained in:
Steven Webster 2019-08-13 10:11:16 -05:00
parent d42abdcb9e
commit d124d1a52b
2 changed files with 7 additions and 4 deletions

View File

@ -1,6 +1,10 @@
# SRIOV-CNI Release v1
# Based on:
# https://github.com/intel/sriov-cni/blob/master/images/sriov-cni-daemonset.yaml
#
# The following modifications have been made:
#
# - The daemonset is modified to tolerate all NoSchedule taints
---
apiVersion: extensions/v1beta1
kind: DaemonSet
@ -21,8 +25,7 @@ spec:
nodeSelector:
beta.kubernetes.io/arch: amd64
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- operator: Exists
effect: NoSchedule
containers:
- name: kube-sriov-cni

View File

@ -7,6 +7,7 @@
# - A nodeSelector of 'sriovdp' has been added to ensure the sriov device plugin
# pods only run on appropriately labelled nodes.
# - The config hostPath is explicitly set to 'File'
# - The daemonset is modified to tolerate all NoSchedule taints
---
apiVersion: v1
kind: ServiceAccount
@ -34,8 +35,7 @@ spec:
beta.kubernetes.io/arch: amd64
sriovdp: enabled
tolerations:
- key: node-role.kubernetes.io/master
operator: Exists
- operator: Exists
effect: NoSchedule
serviceAccountName: sriov-device-plugin
containers: