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
pull/6/head
k8s-merge-robot 2016-05-29 15:49:00 -07:00
commit 32da727ca1
1 changed files with 2 additions and 1 deletions

View File

@ -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 {