github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not call NewFlannelServer() unless flannel overlay is enabled

Browse Source
This commit is contained in:
Lucas Käldström
2016-05-25 16:09:39 +03:00
parent 83c78fdcaa
commit fdff659ced
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@@ -349,7 +349,7 @@ func NewMainKubelet(
daemonEndpoints: daemonEndpoints, daemonEndpoints: daemonEndpoints,
containerManager: containerManager, containerManager: containerManager,
flannelExperimentalOverlay: flannelExperimentalOverlay, flannelExperimentalOverlay: flannelExperimentalOverlay,
flannelHelper: NewFlannelHelper(), flannelHelper: nil,
nodeIP: nodeIP, nodeIP: nodeIP,
clock: util.RealClock{}, clock: util.RealClock{},
outOfDiskTransitionFrequency: outOfDiskTransitionFrequency, outOfDiskTransitionFrequency: outOfDiskTransitionFrequency,
@@ -359,6 +359,7 @@ func NewMainKubelet(
} }
if klet.flannelExperimentalOverlay { if klet.flannelExperimentalOverlay {
klet.flannelHelper = NewFlannelHelper()
glog.Infof("Flannel is in charge of podCIDR and overlay networking.") glog.Infof("Flannel is in charge of podCIDR and overlay networking.")
} }
if klet.nodeIP != nil { if klet.nodeIP != nil {