From fa1f3ac65b41c36f0a379bd9307f79dcb4c8218a Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Date: Thu, 27 Jan 2022 16:51:10 +0100 Subject: [PATCH] Move into a soft-exit in case of kubelet error Depends-On: #575 Signed-off-by: Miguel Angel Ajo --- pkg/node/kubelet.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkg/node/kubelet.go b/pkg/node/kubelet.go index 5598c2f04c..df75477e22 100644 --- a/pkg/node/kubelet.go +++ b/pkg/node/kubelet.go @@ -158,8 +158,8 @@ serverTLSBootstrap: false #TODO`) } func (s *KubeletServer) Run(ctx context.Context, ready chan<- struct{}, stopped chan<- struct{}) error { - defer close(stopped) + // run readiness check go func() { healthcheckStatus := util.RetryInsecureHttpsGet("http://127.0.0.1:10248/healthz") @@ -178,10 +178,13 @@ func (s *KubeletServer) Run(ctx context.Context, ready chan<- struct{}, stopped kubeletDeps, err := kubelet.UnsecuredDependencies(kubeletServer, utilfeature.DefaultFeatureGate) if err != nil { - klog.Fatalf("Error in fetching depenedencies", err) + klog.Errorf("Error in fetching kubelet depenedencies", err) + return err } + if err := kubelet.Run(ctx, kubeletServer, kubeletDeps, utilfeature.DefaultFeatureGate); err != nil { - klog.Fatalf("Kubelet failed to start", err) + klog.Errorf("Kubelet failed to start", err) + return err } return ctx.Err() }