From 59bf848e5417b0333021f6ec52ac2941d7559989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 28 Jun 2020 16:36:03 +0200 Subject: [PATCH] Use preloaded tarball for cri-o container runtime Pretty much the same as containerd, minus Restart --- pkg/minikube/cruntime/containerd.go | 4 ++-- pkg/minikube/cruntime/crio.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 50d59bbd57..d2eacdbfe0 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -370,7 +370,7 @@ func containerdImagesPreloaded(runner command.Runner, images []string) bool { if err != nil { return false } - type criImages struct { + type crictlImages struct { Images []struct { ID string `json:"id"` RepoTags []string `json:"repoTags"` @@ -381,7 +381,7 @@ func containerdImagesPreloaded(runner command.Runner, images []string) bool { } `json:"images"` } - var jsonImages criImages + var jsonImages crictlImages err = json.Unmarshal(rr.Stdout.Bytes(), &jsonImages) if err != nil { glog.Errorf("failed to unmarshal images, will assume images are not preloaded") diff --git a/pkg/minikube/cruntime/crio.go b/pkg/minikube/cruntime/crio.go index f3a2022824..5d983cb8b6 100644 --- a/pkg/minikube/cruntime/crio.go +++ b/pkg/minikube/cruntime/crio.go @@ -283,7 +283,7 @@ func crioImagesPreloaded(runner command.Runner, images []string) bool { if err != nil { return false } - type criImages struct { + type crictlImages struct { Images []struct { ID string `json:"id"` RepoTags []string `json:"repoTags"` @@ -294,7 +294,7 @@ func crioImagesPreloaded(runner command.Runner, images []string) bool { } `json:"images"` } - var jsonImages criImages + var jsonImages crictlImages err = json.Unmarshal(rr.Stdout.Bytes(), &jsonImages) if err != nil { glog.Errorf("failed to unmarshal images, will assume images are not preloaded") @@ -322,7 +322,7 @@ func crioImagesPreloaded(runner command.Runner, images []string) bool { return false } } - glog.Infof("all images are preloaded for crio runtime.") + glog.Infof("all images are preloaded for cri-o runtime.") return true }