github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Move default directory for exec plugin into exec plugin

Browse Source
This commit is contained in:
Bryan Boreham 2016-09-09 11:38:52 +01:00 committed by Bryan Boreham
parent 4e961e2bf5
commit a2e583a86c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/componentconfig/v1alpha1/defaults.go
View File

@ -249,11 +249,6 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
if obj.MinimumGCAge == zeroDuration { if obj.MinimumGCAge == zeroDuration {
obj.MinimumGCAge = unversioned.Duration{Duration: 0} obj.MinimumGCAge = unversioned.Duration{Duration: 0}
} }
// For backwards-compat NetworkPluginDir is consulted as source of CNI config
// but CNIConfDir is preferred; don't set this default if CNI is in use.
if obj.NetworkPluginDir == "" && obj.NetworkPluginName != "cni" {
obj.NetworkPluginDir = "/usr/libexec/kubernetes/kubelet-plugins/net/exec/"
}
if obj.NonMasqueradeCIDR == "" { if obj.NonMasqueradeCIDR == "" {
obj.NonMasqueradeCIDR = "10.0.0.0/8" obj.NonMasqueradeCIDR = "10.0.0.0/8"
} }

5
pkg/kubelet/network/exec/exec.go
View File

@ -85,11 +85,16 @@ const (
setUpCmd = "setup" setUpCmd = "setup"
tearDownCmd = "teardown" tearDownCmd = "teardown"
statusCmd = "status" statusCmd = "status"
defaultDir = "/usr/libexec/kubernetes/kubelet-plugins/net/exec/"
) )
func ProbeNetworkPlugins(pluginDir string) []network.NetworkPlugin { func ProbeNetworkPlugins(pluginDir string) []network.NetworkPlugin {
execPlugins := []network.NetworkPlugin{} execPlugins := []network.NetworkPlugin{}
if pluginDir == "" {
pluginDir = defaultDir
}
files, _ := ioutil.ReadDir(pluginDir) files, _ := ioutil.ReadDir(pluginDir)
for _, f := range files { for _, f := range files {
// only directories are counted as plugins // only directories are counted as plugins