Skip to content

Commit

Permalink
Merge pull request #7015 from tstromberg/lz4-missing
Browse files Browse the repository at this point in the history
none: Skip driver preload and image caching
  • Loading branch information
medyagh authored Mar 11, 2020
2 parents 2412dd5 + 8a13254 commit c57e415
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 3 additions & 1 deletion pkg/minikube/node/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ func configureRuntimes(runner cruntime.CommandRunner, drvName string, k8s config
if driver.BareMetal(drvName) {
disableOthers = false
}
if !driver.IsKIC(drvName) {

// Preload is overly invasive for bare metal, and caching is not meaningful.
if driver.IsVM(drvName) {
if err := cr.Preload(k8s.KubernetesVersion); err != nil {
switch err.(type) {
case *cruntime.ErrISOFeature:
Expand Down
5 changes: 4 additions & 1 deletion pkg/minikube/node/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ func Start(mc config.ClusterConfig, n config.Node, primary bool, existingAddons
}

var cacheGroup errgroup.Group
beginCacheKubernetesImages(&cacheGroup, mc.KubernetesConfig.ImageRepository, k8sVersion, mc.KubernetesConfig.ContainerRuntime)
// Adding a second layer of cache does not make sense for the none driver
if !driver.BareMetal(driverName) {
beginCacheKubernetesImages(&cacheGroup, mc.KubernetesConfig.ImageRepository, k8sVersion, mc.KubernetesConfig.ContainerRuntime)
}

// Abstraction leakage alert: startHost requires the config to be saved, to satistfy pkg/provision/buildroot.
// Hence, saveConfig must be called before startHost, and again afterwards when we know the IP.
Expand Down

0 comments on commit c57e415

Please sign in to comment.