Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arm64: Fix incorrect image arch in the manifest for etcd and other kube images #10642

Merged
merged 7 commits into from
Mar 22, 2021
Merged

arm64: Fix incorrect image arch in the manifest for etcd and other kube images #10642

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c22d606
fix image platform on retrieve
ilya-zuyev Feb 26, 2021
4a3aee4
fix
ilya-zuyev Feb 26, 2021
612bdb7
fix
ilya-zuyev Feb 26, 2021
cc5e919
Merge branch 'master' into ilyaz/fix_img_platform
ilya-zuyev Feb 26, 2021
84af0a4
use WithPlatform option for anon image retrieves
ilya-zuyev Feb 26, 2021
94b9149
Add link to GitHub issue in hack method comment
ilya-zuyev Mar 16, 2021
628805b
fix imports order
ilya-zuyev Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions pkg/minikube/image/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ import (
"github.com/google/go-containerregistry/pkg/name"
v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/google/go-containerregistry/pkg/v1/daemon"
"github.com/google/go-containerregistry/pkg/v1/mutate"
"github.com/google/go-containerregistry/pkg/v1/remote"
"github.com/google/go-containerregistry/pkg/v1/tarball"

"github.com/pkg/errors"
"k8s.io/klog/v2"
"k8s.io/minikube/pkg/minikube/constants"
Expand Down Expand Up @@ -172,19 +174,47 @@ func retrieveImage(ref name.Reference) (v1.Image, error) {
return img, nil
}
// reference does not exist in the local daemon
klog.Infof("daemon lookup for %+v: %v", ref, err)

img, err = retrieveRemote(ref, defaultPlatform)
if err != nil {
klog.Infof("daemon lookup for %+v: %v", ref, err)
return nil, err
}
return fixPlatform(ref, img, defaultPlatform)
}

platform := defaultPlatform
img, err = remote.Image(ref, remote.WithAuthFromKeychain(authn.DefaultKeychain), remote.WithPlatform(platform))
func retrieveRemote(ref name.Reference, p v1.Platform) (v1.Image, error) {
img, err := remote.Image(ref, remote.WithAuthFromKeychain(authn.DefaultKeychain), remote.WithPlatform(p))
if err == nil {
return img, nil
}

klog.Warningf("authn lookup for %+v (trying anon): %+v", ref, err)
img, err = remote.Image(ref)
return img, err
return remote.Image(ref, remote.WithPlatform(p))
}

// See https://github.com/kubernetes/minikube/issues/10402
// check if downloaded image Architecture field matches the requested and fix it otherwise
func fixPlatform(ref name.Reference, img v1.Image, p v1.Platform) (v1.Image, error) {
spowelljr marked this conversation as resolved.
Show resolved Hide resolved
cfg, err := img.ConfigFile()
if err != nil {
klog.Warningf("failed to get config for %s: %v", ref, err)
return img, err
}

if cfg.Architecture == p.Architecture {
return img, nil
}
klog.Warningf("image %s arch mismatch: want %s got %s. fixing",
ref, p.Architecture, cfg.Architecture)

cfg.Architecture = p.Architecture
img, err = mutate.ConfigFile(img, cfg)
if err != nil {
klog.Warningf("failed to change config for %s: %v", ref, err)
return img, errors.Wrap(err, "failed to change image config")
}
return img, nil
}

func cleanImageCacheDir() error {
Expand Down