Merge pull request #7816 from medyagh/hack_preload_prune

hack preload script: delete prune

hack/preload-images/generate.go

@@ -182,7 +182,7 @@ func copyTarballToHost(tarballFilename string) error {
 }
 
 func deleteMinikube() error {
-	cmd := exec.Command(minikubePath, "delete", "-p", profile)
+	cmd := exec.Command(minikubePath, "delete", "--all", "--prune") // to avoid https://github.com/kubernetes/minikube/issues/7814
 	cmd.Stdout = os.Stdout
 	return cmd.Run()
 }

hack/preload-images/preload_images.go

@@ -56,6 +56,10 @@ func main() {
 		}
 	}()
 
+	if err := deleteMinikube(); err != nil {
+		fmt.Printf("error cleaning up minikube at start up: %v", err)
+	}
+
 	if err := verifyDockerStorage(); err != nil {
 		exit.WithError("Docker storage type is incompatible: %v\n", err)
 	}
@@ -81,6 +85,11 @@ func main() {
 			if err := uploadTarball(tf); err != nil {
 				exit.WithError(fmt.Sprintf("uploading tarball for k8s version %s with %s", kv, cr), err)
 			}
+
+			if err := deleteMinikube(); err != nil {
+				fmt.Printf("error cleaning up minikube at start up: %v", err)
+			}
+
 		}
 	}
 }