Merge pull request #26264 from luxas/remove_flannel_default

Automatic merge from submit-queue Do not call NewFlannelServer() unless flannel overlay is enabled Ref: #26093 This makes so kubelet does not warn the user that iptables isn't in PATH, although the user didn't enable the flannel overlay. @vishh @freehan @bprashanth

Merge pull request #26264 from luxas/remove_flannel_default
32da727c · k8s-merge-robot · 72479b82 · fdff659c · 32da727c
Commit 32da727c authored May 29, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

kubelet.go pkg/kubelet/kubelet.go +2 -1

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -353,7 +353,7 @@ func NewMainKubelet(
 		daemonEndpoints:            daemonEndpoints,
 		containerManager:           containerManager,
 		flannelExperimentalOverlay: flannelExperimentalOverlay,
-		flannelHelper:              NewFlannelHelper(),
+		flannelHelper:              nil,
 		nodeIP:                     nodeIP,
 		clock:                      util.RealClock{},
 		outOfDiskTransitionFrequency: outOfDiskTransitionFrequency,
@@ -363,6 +363,7 @@ func NewMainKubelet(
 	}

 	if klet.flannelExperimentalOverlay {
+		klet.flannelHelper = NewFlannelHelper()
 		glog.Infof("Flannel is in charge of podCIDR and overlay networking.")
 	}
 	if klet.nodeIP != nil {