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

Merge pull request #17907 from prezha/fix-cri-docker-restart 

fix "Failed to enable container runtime: sudo systemctl restart cri-docker"
pull/17937/head
Steven Powell 2024-01-10 14:31:07 -08:00 committed by GitHub
parent 042336d576 7ea9a0daea
commit 00de339f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/minikube/cruntime/docker.go
View File

@ -171,21 +171,35 @@ func (r *Docker) Enable(disOthers bool, cgroupDriver string, inUserNamespace boo
return err
}
// restart cri-docker
// avoid error: "Exiting due to RUNTIME_ENABLE: Failed to enable container runtime: sudo systemctl restart cri-docker: exit status 1"
// => journalctl: "cri-docker.socket: Socket service cri-docker.service already active, refusing."
if r.CRIService != "" {
if err := r.Init.Enable("cri-docker.socket"); err != nil {
socket := "cri-docker.socket"
service := "cri-docker.service"
// allow "native" socket activation:
// prevent active socket to reactivate service, that we're going to stop next - 'systemctl status cri-docker.socket': "Triggers: cri-docker.service"
// intentionally continue on any error
if r.Init.Active(socket) {
_ = r.Init.Stop(socket)
}
if r.Init.Active(service) {
_ = r.Init.Stop(service)
}
if err := r.Init.Unmask(socket); err != nil {
return err
}
if err := r.Init.Unmask(r.CRIService); err != nil {
if err := r.Init.Enable(socket); err != nil {
return err
}
if err := r.Init.Enable(r.CRIService); err != nil {
if err := r.Init.Restart(socket); err != nil {
return err
}
if err := r.Init.Restart(r.CRIService); err != nil {
return err
}
if err := r.Init.Restart("cri-docker"); err != nil {
return err
// try to restart service if stopped, intentionally continue on any error
if !r.Init.Active(service) {
_ = r.Init.Restart(service)
}
}