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.
This commit is contained in:
Markus Lehtonen 2023-06-16 11:41:30 +03:00 committed by Peter Hunt
parent 37330a1392
commit fd434003f3

View File

@ -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
}