mirror of https://github.com/k3s-io/k3s
Merge pull request #62055 from feiskyer/cni-bin-dir
Automatic merge from submit-queue (batch tested with PRs 61549, 62230, 62055, 61082, 62212). 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>. Setup default cni dir correctly **What this PR does / why we need it**: Kubelet failed to set up pod with error: failed to find plugin "loopback" in path []. This only happens when kubelet's --cni-bin-dir not set. This PR fixes this. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #62054 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```pull/8/head
commit
9d0826df56
|
@ -75,7 +75,7 @@ func SplitDirs(dirs string) []string {
|
|||
|
||||
func ProbeNetworkPlugins(confDir string, binDirs []string) []network.NetworkPlugin {
|
||||
old := binDirs
|
||||
binDirs = make([]string, len(binDirs))
|
||||
binDirs = make([]string, 0, len(binDirs))
|
||||
for _, dir := range old {
|
||||
if dir != "" {
|
||||
binDirs = append(binDirs, dir)
|
||||
|
|
Loading…
Reference in New Issue