From e6ca19d059903b2e2791caa0390b19626c04ae6e Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 10 Dec 2018 10:32:55 -0800 Subject: [PATCH] Ensure reconcile ticker stops on shutdown Otherwise this ticker could run forever (or until the process exits). --- vkubelet/vkubelet.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vkubelet/vkubelet.go b/vkubelet/vkubelet.go index 7f2af9213..9512afd7b 100644 --- a/vkubelet/vkubelet.go +++ b/vkubelet/vkubelet.go @@ -106,14 +106,15 @@ func New(ctx context.Context, cfg Config) (s *Server, retErr error) { return s, err } - tick := time.Tick(5 * time.Second) - go func() { + tick := time.NewTicker(5 * time.Second) + defer tick.Stop() + for { select { case <-ctx.Done(): return - case <-tick: + case <-tick.C: ctx, span := trace.StartSpan(ctx, "syncActualState") s.updateNode(ctx) s.updatePodStatuses(ctx)