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

Merge pull request #8588 from afbjorklund/preload-crio-2 

Use preloaded tarball for cri-o container runtime
pull/8744/head
Medya Ghazizadeh 2020-07-21 13:59:03 -07:00 committed by GitHub
parent 280c2511f7 59bf848e54
commit 24fa6280dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/minikube/cruntime/containerd.go
View File

@ -370,7 +370,7 @@ func containerdImagesPreloaded(runner command.Runner, images []string) bool {
if err != nil { if err != nil {
return false return false
} }
type criImages struct { type crictlImages struct {
Images []struct { Images []struct {
ID string `json:"id"` ID string `json:"id"`
RepoTags []string `json:"repoTags"` RepoTags []string `json:"repoTags"`
@ -381,7 +381,7 @@ func containerdImagesPreloaded(runner command.Runner, images []string) bool {
} `json:"images"` } `json:"images"`
} }
var jsonImages criImages var jsonImages crictlImages
err = json.Unmarshal(rr.Stdout.Bytes(), &jsonImages) err = json.Unmarshal(rr.Stdout.Bytes(), &jsonImages)
if err != nil { if err != nil {
glog.Errorf("failed to unmarshal images, will assume images are not preloaded") glog.Errorf("failed to unmarshal images, will assume images are not preloaded")

6
pkg/minikube/cruntime/crio.go
View File

@ -283,7 +283,7 @@ func crioImagesPreloaded(runner command.Runner, images []string) bool {
if err != nil { if err != nil {
return false return false
} }
type criImages struct { type crictlImages struct {
Images []struct { Images []struct {
ID string `json:"id"` ID string `json:"id"`
RepoTags []string `json:"repoTags"` RepoTags []string `json:"repoTags"`
@ -294,7 +294,7 @@ func crioImagesPreloaded(runner command.Runner, images []string) bool {
} `json:"images"` } `json:"images"`
} }
var jsonImages criImages var jsonImages crictlImages
err = json.Unmarshal(rr.Stdout.Bytes(), &jsonImages) err = json.Unmarshal(rr.Stdout.Bytes(), &jsonImages)
if err != nil { if err != nil {
glog.Errorf("failed to unmarshal images, will assume images are not preloaded") 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 return false
} }
} }
glog.Infof("all images are preloaded for crio runtime.") glog.Infof("all images are preloaded for cri-o runtime.")
return true return true
} }