kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14613 from hakman/load_images_before_kubelet 

Load images before starting the kubelet service
This commit is contained in:
Kubernetes Prow Robot 2022-11-20 21:18:30 -08:00 committed by GitHub
parent a2ed86d261 29b6e0d638
commit a6cfdf5165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
upup/pkg/fi/nodeup/nodetasks/service.go
View File

@ -37,14 +37,13 @@ const (
// TODO: Generally only repo packages write to /usr/lib/systemd/system on _rhel_family // TODO: Generally only repo packages write to /usr/lib/systemd/system on _rhel_family
// But we use it in two ways: we update the docker manifest, and we install our own // But we use it in two ways: we update the docker manifest, and we install our own
// package (protokube, kubelet). Maybe we should have the idea of a "system" package. // package (protokube, kubelet). Maybe we should have the idea of a "system" package.
centosSystemdSystemPath = "/usr/lib/systemd/system" centosSystemdSystemPath = "/usr/lib/systemd/system"
flatcarSystemdSystemPath = "/etc/systemd/system"
flatcarSystemdSystemPath = "/etc/systemd/system"
containerosSystemdSystemPath = "/etc/systemd/system" containerosSystemdSystemPath = "/etc/systemd/system"
containerdService = "containerd.service" containerdService = "containerd.service"
dockerService = "docker.service" dockerService = "docker.service"
kubeletService = "kubelet.service"
protokubeService = "protokube.service" protokubeService = "protokube.service"
) )
@ -75,8 +74,12 @@ func (p *Service) GetDependencies(tasks map[string]fi.Task) []fi.Task {
switch v := v.(type) { switch v := v.(type) {
case *Package, *UpdatePackages, *UserTask, *GroupTask, *Chattr, *BindMount, *Archive, *Prefix, *UpdateEtcHostsTask: case *Package, *UpdatePackages, *UserTask, *GroupTask, *Chattr, *BindMount, *Archive, *Prefix, *UpdateEtcHostsTask:
deps = append(deps, v) deps = append(deps, v)
case *Service, *LoadImageTask, *PullImageTask, *IssueCert, *BootstrapClientTask, *KubeConfig: case *Service, *PullImageTask, *IssueCert, *BootstrapClientTask, *KubeConfig:
// ignore // ignore
case *LoadImageTask:
if p.Name == kubeletService {
deps = append(deps, v)
}
case *File: case *File:
if len(v.BeforeServices) > 0 { if len(v.BeforeServices) > 0 {
for _, s := range v.BeforeServices { for _, s := range v.BeforeServices {