From e601a6a4086800e73ffd610439a1ce33df5472c6 Mon Sep 17 00:00:00 2001 From: hzxuzhonghu Date: Mon, 19 Mar 2018 11:57:18 +0800 Subject: [PATCH] fix bug: kubelet potential panic --- cmd/kubelet/app/server.go | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 3337d3a1f47..a93077b4124 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -31,7 +31,6 @@ import ( "path" "path/filepath" "strconv" - "sync" "time" "github.com/coreos/go-systemd/daemon" @@ -948,31 +947,19 @@ func RunKubelet(kubeFlags *options.KubeletFlags, kubeCfg *kubeletconfiginternal. } func startKubelet(k kubelet.Bootstrap, podCfg *config.PodConfig, kubeCfg *kubeletconfiginternal.KubeletConfiguration, kubeDeps *kubelet.Dependencies, enableServer bool) { - wg := sync.WaitGroup{} - // start the kubelet - wg.Add(1) go wait.Until(func() { - wg.Done() k.Run(podCfg.Updates()) }, 0, wait.NeverStop) // start the kubelet server if enableServer { - wg.Add(1) - go wait.Until(func() { - wg.Done() - k.ListenAndServe(net.ParseIP(kubeCfg.Address), uint(kubeCfg.Port), kubeDeps.TLSOptions, kubeDeps.Auth, kubeCfg.EnableDebuggingHandlers, kubeCfg.EnableContentionProfiling) - }, 0, wait.NeverStop) + go k.ListenAndServe(net.ParseIP(kubeCfg.Address), uint(kubeCfg.Port), kubeDeps.TLSOptions, kubeDeps.Auth, kubeCfg.EnableDebuggingHandlers, kubeCfg.EnableContentionProfiling) + } if kubeCfg.ReadOnlyPort > 0 { - wg.Add(1) - go wait.Until(func() { - wg.Done() - k.ListenAndServeReadOnly(net.ParseIP(kubeCfg.Address), uint(kubeCfg.ReadOnlyPort)) - }, 0, wait.NeverStop) + go k.ListenAndServeReadOnly(net.ParseIP(kubeCfg.Address), uint(kubeCfg.ReadOnlyPort)) } - wg.Wait() } func CreateAndInitKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,