kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #13353 from spowelljr/uploadPreload 

Change file path for preload tar files to be organized by version
pull/13460/head
Steven Powell 2022-01-24 16:44:24 -08:00 committed by GitHub
parent 62bc75e058 85ce840b33
commit 7274cbb1ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/preload-images/preload_images.go
View File

@ -146,7 +146,7 @@ func makePreload(cfg preloadCfg) error {
fmt.Printf("skip upload of %q\n", tf)
return nil
}
if err := uploadTarball(tf); err != nil {
if err := uploadTarball(tf, kv); err != nil {
return errors.Wrap(err, fmt.Sprintf("uploading tarball for k8s version %s with %s", kv, cr))
}
return nil

4
hack/preload-images/upload.go
View File

@ -25,10 +25,10 @@ import (
"k8s.io/minikube/pkg/minikube/download"
)
func uploadTarball(tarballFilename string) error {
func uploadTarball(tarballFilename, k8sVer string) error {
// Upload tarball to GCS
hostPath := path.Join("out/", tarballFilename)
gcsDest := fmt.Sprintf("gs://%s", download.PreloadBucket)
gcsDest := fmt.Sprintf("gs://%s/%s/%s", download.PreloadBucket, download.PreloadVersion, k8sVer)
cmd := exec.Command("gsutil", "cp", hostPath, gcsDest)
fmt.Printf("Running: %v\n", cmd.Args)
if output, err := cmd.CombinedOutput(); err != nil {

7
pkg/minikube/download/preload.go
View File

@ -44,7 +44,7 @@ const (
// PreloadVersion is the current version of the preloaded tarball
//
// NOTE: You may need to bump this version up when upgrading auxiliary docker images
PreloadVersion = "v16"
PreloadVersion = "v17"
// PreloadBucket is the name of the GCS bucket where preloaded volume tarballs exist
PreloadBucket = "minikube-preloaded-volume-tarballs"
)
@ -90,7 +90,7 @@ func TarballPath(k8sVersion, containerRuntime string) string {
// remoteTarballURL returns the URL for the remote tarball in GCS
func remoteTarballURL(k8sVersion, containerRuntime string) string {
return fmt.Sprintf("https://%s/%s/%s", downloadHost, PreloadBucket, TarballName(k8sVersion, containerRuntime))
return fmt.Sprintf("https://%s/%s/%s/%s/%s", downloadHost, PreloadBucket, PreloadVersion, k8sVersion, TarballName(k8sVersion, containerRuntime))
}
func setPreloadState(k8sVersion, containerRuntime string, value bool) {
@ -236,7 +236,8 @@ func getStorageAttrs(name string) (*storage.ObjectAttrs, error) {
// getChecksum returns the MD5 checksum of the preload tarball
var getChecksum = func(k8sVersion, containerRuntime string) ([]byte, error) {
klog.Infof("getting checksum for %s ...", TarballName(k8sVersion, containerRuntime))
attrs, err := getStorageAttrs(TarballName(k8sVersion, containerRuntime))
filename := fmt.Sprintf("%s/%s/%s", PreloadVersion, k8sVersion, TarballName(k8sVersion, containerRuntime))
attrs, err := getStorageAttrs(filename)
if err != nil {
return nil, err
}