github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26264 from luxas/remove_flannel_default

Browse Source 
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
This commit is contained in:
k8s-merge-robot 2016-05-29 15:49:00 -07:00
commit 32da727ca1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@ -353,7 +353,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,
@ -363,6 +363,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 {