Skip to content

K
k3s
Commit fdff659c authored by Lucas Käldström's avatar Lucas Käldström
Browse files
Options

Do not call NewFlannelServer() unless flannel overlay is enabled

parent 83c78fdc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
pkg/kubelet/kubelet.go
View file @ fdff659c
...@@ -349,7 +349,7 @@ func NewMainKubelet( ...@@ -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( ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment