Skip to content

Commit e9b95df

Browse files
mlgibbonsdlorenc
authored andcommitted
Update to catch any errors in loading of cached images into Docker cache in VM which were previously being ignored and leading to unreliable "minikube start" especially in offline mode.
1 parent 0519b23 commit e9b95df

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

pkg/minikube/bootstrapper/kubeadm/kubeadm.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,12 @@ func NewKubeletConfig(k8s config.KubernetesConfig) (string, error) {
259259

260260
func (k *KubeadmBootstrapper) UpdateCluster(cfg config.KubernetesConfig) error {
261261
if cfg.ShouldLoadCachedImages {
262-
// Make best effort to load any cached images
263-
go machine.LoadImages(k.c, constants.GetKubeadmCachedImages(cfg.KubernetesVersion), constants.ImageCacheDir)
262+
err := machine.LoadImages(k.c, constants.GetKubeadmCachedImages(cfg.KubernetesVersion), constants.ImageCacheDir)
263+
if err != nil {
264+
return errors.Wrap(err, "loading cached images")
265+
}
264266
}
267+
265268
kubeadmCfg, err := generateConfig(cfg)
266269
if err != nil {
267270
return errors.Wrap(err, "generating kubeadm cfg")

0 commit comments

Comments
 (0)