mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-11-16 14:35:10 +00:00
7bd2263566
Automatic merge from submit-queue (batch tested with PRs 59740, 59728, 60080, 60086, 58714). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubelet: make --cni-bin-dir accept a comma-separated list of CNI plugin directories Allow CNI-related network plugin drivers (kubenet, cni) to search a list of directories for plugin binaries instead of just one. This allows using an administrator-provided path and fallbacks to others (like the previous default of /opt/cni/bin) for backwards compatibility. ```release-note kubelet's --cni-bin-dir option now accepts multiple comma-separated CNI binary directory paths, which are search for CNI plugins in the given order. ``` @kubernetes/rh-networking @kubernetes/sig-network-misc @freehan @pecameron @rajatchopra