github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44692 from dnardo/e2e_node_test

Browse Source 
Automatic merge from submit-queue

Update kubelet to use the network-plugin-dir if the cni-bin-dir flag is not set.

This is a fix for the regession raised in issue #44683



**What this PR does / why we need it**:

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-21 00:27:00 -07:00 committed by GitHub
commit d3b3c31147
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubelet/app/plugins.go
View File

@ -106,9 +106,14 @@ func ProbeNetworkPlugins(pluginDir, cniConfDir, cniBinDir string) []network.Netw
if cniConfDir == "" { if cniConfDir == "" {
cniConfDir = pluginDir cniConfDir = pluginDir
} }
binDir := cniBinDir
if binDir == "" {
binDir = pluginDir
}
// for each existing plugin, add to the list // for each existing plugin, add to the list
allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, cniBinDir)...) allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(cniConfDir, binDir)...)
allPlugins = append(allPlugins, kubenet.NewPlugin(pluginDir)) allPlugins = append(allPlugins, kubenet.NewPlugin(binDir))
return allPlugins return allPlugins
} }