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

Refactor common code for storage attributes

pull/11132/head
Anders F Björklund 2021-04-20 08:02:40 +02:00
parent 4e9112e29c
commit 4c20019d37
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,16 +161,24 @@ func Preload(k8sVersion, containerRuntime string) error {
return nil
}
func getChecksum(k8sVersion, containerRuntime string) (string, error) {
klog.Infof("getting checksum for %s ...", TarballName(k8sVersion, containerRuntime))
func getStorageAttrs(name string) (*storage.ObjectAttrs, error) {
ctx := context.Background()
client, err := storage.NewClient(ctx, option.WithoutAuthentication())
if err != nil {
return "", errors.Wrap(err, "getting storage client")
return nil, errors.Wrap(err, "getting storage client")
}
attrs, err := client.Bucket(PreloadBucket).Object(TarballName(k8sVersion, containerRuntime)).Attrs(ctx)
attrs, err := client.Bucket(PreloadBucket).Object(name).Attrs(ctx)
if err != nil {
return "", errors.Wrap(err, "getting storage object")
return nil, errors.Wrap(err, "getting storage object")
}
return attrs, nil
}
func getChecksum(k8sVersion, containerRuntime string) (string, error) {
klog.Infof("getting checksum for %s ...", TarballName(k8sVersion, containerRuntime))
attrs, err := getStorageAttrs(TarballName(k8sVersion, containerRuntime))
if err != nil {
return "", err
}
md5 := hex.EncodeToString(attrs.MD5)
return fmt.Sprintf("md5:%s", md5), nil
@ -178,14 +186,9 @@ func getChecksum(k8sVersion, containerRuntime string) (string, error) {
func saveChecksumFile(k8sVersion, containerRuntime string) error {
klog.Infof("saving checksum for %s ...", TarballName(k8sVersion, containerRuntime))
ctx := context.Background()
client, err := storage.NewClient(ctx, option.WithoutAuthentication())
attrs, err := getStorageAttrs(TarballName(k8sVersion, containerRuntime))
if err != nil {
return errors.Wrap(err, "getting storage client")
}
attrs, err := client.Bucket(PreloadBucket).Object(TarballName(k8sVersion, containerRuntime)).Attrs(ctx)
if err != nil {
return errors.Wrap(err, "getting storage object")
return err
}
checksum := attrs.MD5
return ioutil.WriteFile(PreloadChecksumPath(k8sVersion, containerRuntime), checksum, 0o644)