Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix KVM not detecting containerd preload #17658

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Fix KVM not detecting containerd preload #17658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pkg/minikube/cruntime/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
"k8s.io/minikube/pkg/minikube/download"
"k8s.io/minikube/pkg/minikube/style"
"k8s.io/minikube/pkg/minikube/sysinit"
"k8s.io/minikube/pkg/util/retry"
)

const (
Expand Down Expand Up @@ -568,13 +569,20 @@ func (r *Containerd) Restart() error {

// containerdImagesPreloaded returns true if all images have been preloaded
func containerdImagesPreloaded(runner command.Runner, images []string) bool {
rr, err := runner.RunCmd(exec.Command("sudo", "crictl", "images", "--output", "json"))
if err != nil {
var rr *command.RunResult

imageList := func() (err error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hm... I am trying to think, is there a better condition to wait for instead of retrying?

Copy link
Contributor

@prezha prezha Nov 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

EDIT: we probably don't have to wait/retry - pls see the comment below and the followup discussion

rr, err = runner.RunCmd(exec.Command("sudo", "crictl", "images", "--output", "json"))
return err
}

if err := retry.Expo(imageList, 250*time.Millisecond, 5*time.Second); err != nil {
klog.Warningf("failed to get image list: %v", err)
return false
}

var jsonImages crictlImages
err = json.Unmarshal(rr.Stdout.Bytes(), &jsonImages)
err := json.Unmarshal(rr.Stdout.Bytes(), &jsonImages)
if err != nil {
klog.Errorf("failed to unmarshal images, will assume images are not preloaded")
return false
Expand Down
Loading