Only do cache bind mounts for local engines

kubernetes · Apr 24, 2022 · e0a9c26 · e0a9c26
1 parent d9448be
commit e0a9c26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
@@ -186,7 +186,7 @@ func CreateContainerNode(p CreateParams) error {
 		runArgs = append(runArgs, "--ip", p.IP)
 	}
 
-	if runtime.GOOS == "linux" {
+	if runtime.GOOS == "linux" && !IsExternalDaemonHost(p.OCIBinary) {
 		// make sure directory exists, to avoid docker creating it as the root user
 		if err := os.MkdirAll(detect.ImageCacheDir(), 0755); err != nil {
 			return errors.Wrap(err, "mkdir cache")

diff --git a/pkg/minikube/machine/cache_images.go b/pkg/minikube/machine/cache_images.go
@@ -119,7 +119,7 @@ func LoadCachedImages(cc *config.ClusterConfig, runner command.Runner, images []
 			if err == nil {
 				return nil
 			}
-			if driver.IsKIC(cc.Driver) && runtime.GOOS == "linux" {
+			if driver.IsKIC(cc.Driver) && runtime.GOOS == "linux" && !IsExternalDaemonHost(cc.Driver) {
 				klog.Infof("%q needs load: %v", image, err)
 				return volumeLoadCachedImage(runner, cc.KubernetesConfig, image, cacheDir)
 			}
@@ -402,7 +402,7 @@ func SaveCachedImages(cc *config.ClusterConfig, runner command.Runner, images []
 	for _, image := range images {
 		image := image
 		g.Go(func() error {
-			if driver.IsKIC(cc.Driver) && runtime.GOOS == "linux" {
+			if driver.IsKIC(cc.Driver) && runtime.GOOS == "linux" && !IsExternalDaemonHost(cc.Driver) {
 				return volumeSaveCachedImage(runner, cc.KubernetesConfig, image, cacheDir)
 			}
 			return transferAndSaveCachedImage(runner, cc.KubernetesConfig, image, cacheDir)