Fix merge conflict between e09133892f
and 46640cef68
parent
ed58b6fc35
commit
5b46539be8
cmd/minikube/cmd
|
@ -243,7 +243,7 @@ func beginCacheImages(g *errgroup.Group, k8sVersion string) {
|
||||||
if !viper.GetBool(cacheImages) {
|
if !viper.GetBool(cacheImages) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.OutStyle("caching", "Downloading Kubernetes %s images in the background ...", kVersion)
|
console.OutStyle("caching", "Downloading Kubernetes %s images in the background ...", k8sVersion)
|
||||||
g.Go(func() error {
|
g.Go(func() error {
|
||||||
return machine.CacheImagesForBootstrapper(k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
|
return machine.CacheImagesForBootstrapper(k8sVersion, viper.GetString(cmdcfg.Bootstrapper))
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue