github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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
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 {
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 == "" {
obj.NonMasqueradeCIDR = "10.0.0.0/8"
}