From fd434003f3f86727b75fe75e286090b3eaa69935 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Fri, 16 Jun 2023 11:41:30 +0300 Subject: [PATCH] kubelet: initialization of runtime service earlier in the startup This patch refactors the kubelet startup code to initialize the runtime service earlier in the startup sequence. We want this to be able to query the cgroup driver setting from the CRI befure initializing the cgroup manager. --- cmd/kubelet/app/server.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 0cdc710e7f4..8fa32e2cce6 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -625,6 +625,10 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend runAuthenticatorCAReload(ctx.Done()) } + if err := kubelet.PreInitRuntimeService(&s.KubeletConfiguration, kubeDeps); err != nil { + return err + } + var cgroupRoots []string nodeAllocatableRoot := cm.NodeAllocatableRoot(s.CgroupRoot, s.CgroupsPerQOS, s.CgroupDriver) cgroupRoots = append(cgroupRoots, nodeAllocatableRoot) @@ -775,11 +779,6 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend klog.InfoS("Failed to ApplyOOMScoreAdj", "err", err) } - err = kubelet.PreInitRuntimeService(&s.KubeletConfiguration, kubeDeps) - if err != nil { - return err - } - if err := RunKubelet(s, kubeDeps, s.RunOnce); err != nil { return err }