Merge pull request #5000 from tstromberg/pbar

Use a temp dest to atomically download the iso
kubernetes · Aug 7, 2019 · a8752f1 · a8752f1
2 parents 551b164 + 08d97cf
commit a8752f1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/pkg/util/downloader.go b/pkg/util/downloader.go
@@ -65,10 +65,14 @@ func (f DefaultDownloader) CacheMinikubeISOFromURL(url string) error {
 		urlWithChecksum = url + "?checksum=file:" + constants.DefaultISOSHAURL
 	}
 
+	dst := f.GetISOCacheFilepath(url)
+	// Predictable temp destination so that resume can function
+	tmpDst := dst + ".download"
+
 	opts := []getter.ClientOption{getter.WithProgress(defaultProgressBar)}
 	client := &getter.Client{
 		Src:     urlWithChecksum,
-		Dst:     f.GetISOCacheFilepath(url),
+		Dst:     tmpDst,
 		Mode:    getter.ClientModeFile,
 		Options: opts,
 	}
@@ -78,7 +82,7 @@ func (f DefaultDownloader) CacheMinikubeISOFromURL(url string) error {
 	if err := client.Get(); err != nil {
 		return errors.Wrap(err, url)
 	}
-	return nil
+	return os.Rename(tmpDst, dst)
 }
 
 // ShouldCacheMinikubeISO returns if we need to download the ISO