Manual changes for go-containerregistry.

pkg/minikube/machine/cache_images.go

@@ -18,13 +18,21 @@ package machine
 
 import (
 	"io/ioutil"
+	"net/http"
 	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+	"github.com/google/go-containerregistry/v1/tarball"
+
+	"github.com/google/go-containerregistry/authn"
+
+	"github.com/google/go-containerregistry/name"
+	"github.com/google/go-containerregistry/v1/remote"
+
 	"golang.org/x/sync/errgroup"
 
 	"k8s.io/minikube/pkg/minikube/assets"
@@ -33,11 +41,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/constants"
 	"k8s.io/minikube/pkg/minikube/sshutil"
 
-	"github.com/containers/image/copy"
-	"github.com/containers/image/docker"
-	"github.com/containers/image/docker/archive"
-	"github.com/containers/image/signature"
-	"github.com/containers/image/types"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
 )
@@ -260,33 +263,17 @@ func cleanImageCacheDir() error {
 	return err
 }
 
-func getSrcRef(image string) (types.ImageReference, error) {
-	srcRef, err := docker.ParseReference("//" + image)
-	if err != nil {
-		return nil, errors.Wrap(err, "parsing docker image src ref")
-	}
-	return srcRef, nil
-}
-
-func getDstRef(image, dst string) (types.ImageReference, error) {
+func getDstPath(image, dst string) (string, error) {
 	if runtime.GOOS == "windows" && hasWindowsDriveLetter(dst) {
 		// ParseReference does not support a Windows drive letter.
 		// Therefore, will replace the drive letter to a volume name.
 		var err error
 		if dst, err = replaceWinDriveLetterToVolumeName(dst); err != nil {
-			return nil, errors.Wrap(err, "parsing docker archive dst ref: replace a Win drive letter to a volume name")
+			return "", errors.Wrap(err, "parsing docker archive dst ref: replace a Win drive letter to a volume name")
 		}
 	}
 
-	return _getDstRef(image, dst)
-}
-
-func _getDstRef(image, dst string) (types.ImageReference, error) {
-	dstRef, err := archive.ParseReference(dst + ":" + image)
-	if err != nil {
-		return nil, errors.Wrap(err, "parsing docker archive dst ref")
-	}
-	return dstRef, nil
+	return dst, nil
 }
 
 func CacheImage(image, dst string) error {
@@ -295,44 +282,28 @@ func CacheImage(image, dst string) error {
 		return nil
 	}
 
-	if err := os.MkdirAll(filepath.Dir(dst), 0777); err != nil {
-		return errors.Wrapf(err, "making cache image directory: %s", dst)
-	}
-
-	srcRef, err := getSrcRef(image)
+	dstPath, err := getDstPath(image, dst)
 	if err != nil {
-		return errors.Wrap(err, "creating docker image src ref")
+		return errors.Wrap(err, "getting destination path")
 	}
 
-	dstRef, err := getDstRef(image, dst)
-	if err != nil {
-		return errors.Wrap(err, "creating docker archive dst ref")
+	if err := os.MkdirAll(filepath.Dir(dstPath), 0777); err != nil {
+		return errors.Wrapf(err, "making cache image directory: %s", dst)
 	}
 
-	policy := &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
-	policyContext, err := signature.NewPolicyContext(policy)
+	tag, err := name.NewTag(image, name.WeakValidation)
 	if err != nil {
-		return errors.Wrap(err, "getting policy context")
+		return errors.Wrap(err, "creating docker image name")
 	}
 
-	tmp, err := ioutil.TempDir("", "")
+	auth, err := authn.DefaultKeychain.Resolve(tag.Registry)
 	if err != nil {
-		return errors.Wrap(err, "making temp dir")
-	}
-	defer os.RemoveAll(tmp)
-	sourceCtx := &types.SystemContext{
-		// By default, the image library will try to look at /etc/docker/certs.d
-		// As a non-root user, this would result in a permissions error,
-		// so, we skip this step by just looking in a newly created tmpdir.
-		DockerCertPath: tmp,
+		return errors.Wrap(err, "setting up registry auth")
 	}
-
-	err = copy.Image(policyContext, dstRef, srcRef, &copy.Options{
-		SourceCtx: sourceCtx,
-	})
+	img, err := remote.Image(tag, auth, http.DefaultTransport)
 	if err != nil {
-		return errors.Wrap(err, "copying image")
+		return errors.Wrap(err, "fetching remote image")
 	}
 
-	return nil
+	return tarball.Write(dstPath, tag, img, nil)
 }

pkg/minikube/machine/cache_images_test.go

@@ -20,47 +20,9 @@ import (
 	"io/ioutil"
 	"os"
 	"runtime"
-	"strings"
 	"testing"
-
-	"k8s.io/minikube/pkg/minikube/constants"
 )
 
-func TestGetSrcRef(t *testing.T) {
-	for _, image := range constants.LocalkubeCachedImages {
-		if _, err := getSrcRef(image); err != nil {
-			t.Errorf("Error getting src ref for %s: %s", image, err)
-		}
-	}
-}
-
-func TestGetDstRef(t *testing.T) {
-	paths := []struct {
-		path, separator string
-	}{
-		{`/Users/foo/.minikube/cache/images`, `/`},
-		{`/home/foo/.minikube/cache/images`, `/`},
-		{`\\?\Volume{aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee}\Users\foo\.minikube\cache\images`, `\`},
-		{`\\?\Volume{aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee}\minikube\.minikube\cache\images`, `\`},
-	}
-
-	cases := []struct {
-		image, dst string
-	}{}
-	for _, tp := range paths {
-		for _, image := range constants.LocalkubeCachedImages {
-			dst := strings.Join([]string{tp.path, strings.Replace(image, ":", "_", -1)}, tp.separator)
-			cases = append(cases, struct{ image, dst string }{image, dst})
-		}
-	}
-
-	for _, tc := range cases {
-		if _, err := _getDstRef(tc.image, tc.dst); err != nil {
-			t.Errorf("Error getting dst ref for %s: %s", tc.dst, err)
-		}
-	}
-}
-
 func TestReplaceWinDriveLetterToVolumeName(t *testing.T) {
 	path, err := ioutil.TempDir("", "repwindl2vn")
 	if err != nil {