github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14525 from dcbw/cni

Browse Source 
CNI network plugin
This commit is contained in:
Tim Hockin
2015-09-29 21:13:26 -07:00
parent 22fa2db39a 01dd813ce3
commit 5fbcb72241
15 changed files with 1033 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@ import (
_ "k8s.io/kubernetes/pkg/credentialprovider/gcp"
// Network plugins
"k8s.io/kubernetes/pkg/kubelet/network"
"k8s.io/kubernetes/pkg/kubelet/network/cni"
"k8s.io/kubernetes/pkg/kubelet/network/exec"
// Volume plugins
"k8s.io/kubernetes/pkg/volume"
@@ -78,6 +79,7 @@ func ProbeNetworkPlugins(pluginDir string) []network.NetworkPlugin {
// for each existing plugin, add to the list
allPlugins = append(allPlugins, exec.ProbeNetworkPlugins(pluginDir)...)
allPlugins = append(allPlugins, cni.ProbeNetworkPlugins(pluginDir)...)
return allPlugins
}