From b5e088ad59bb4c320d335633bc0d420223932a6b Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Tue, 24 Mar 2020 13:44:51 -0700 Subject: [PATCH] run preload on hot restarts as well, in case kubernetes version has been upgraded --- pkg/minikube/bootstrapper/kubeadm/kubeadm.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go index a6c1bbe3dd..5de297a003 100644 --- a/pkg/minikube/bootstrapper/kubeadm/kubeadm.go +++ b/pkg/minikube/bootstrapper/kubeadm/kubeadm.go @@ -524,17 +524,22 @@ func (k *Bootstrapper) UpdateCluster(cfg config.ClusterConfig) error { return errors.Wrap(err, "kubeadm images") } - if cfg.KubernetesConfig.ShouldLoadCachedImages { - if err := machine.LoadImages(&cfg, k.c, images, constants.ImageCacheDir); err != nil { - out.FailureT("Unable to load cached images: {{.error}}", out.V{"error": err}) - } - } r, err := cruntime.New(cruntime.Config{Type: cfg.KubernetesConfig.ContainerRuntime, Runner: k.c, Socket: cfg.KubernetesConfig.CRISocket}) if err != nil { return errors.Wrap(err, "runtime") } + if err := r.Preload(cfg.KubernetesConfig); err != nil { + return errors.Wrap(err, "preloading") + } + + if cfg.KubernetesConfig.ShouldLoadCachedImages { + if err := machine.LoadImages(&cfg, k.c, images, constants.ImageCacheDir); err != nil { + out.FailureT("Unable to load cached images: {{.error}}", out.V{"error": err}) + } + } + for _, n := range cfg.Nodes { err := k.UpdateNode(cfg, n, r) if err != nil {