Skip to content

Commit 67db97f

Browse files
fix: set current platform as default platform when retrieving image entrypoint. Fixes argoproj#15058 (argoproj#15059)
Signed-off-by: guamian-delicious <32569905@qq.com> Co-authored-by: jswxstw <385920199@qq.com>
1 parent 76eda6f commit 67db97f

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

workflow/controller/entrypoint/container_registry_index.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ package entrypoint
22

33
import (
44
"context"
5+
"runtime"
56

67
"github.com/google/go-containerregistry/pkg/authn/k8schain"
78
"github.com/google/go-containerregistry/pkg/name"
9+
pkgv1 "github.com/google/go-containerregistry/pkg/v1"
810
"github.com/google/go-containerregistry/pkg/v1/remote"
911
v1 "k8s.io/api/core/v1"
1012
"k8s.io/client-go/kubernetes"
@@ -27,7 +29,11 @@ func (i *containerRegistryIndex) Lookup(ctx context.Context, image string, optio
2729
if err != nil {
2830
return nil, err
2931
}
30-
img, err := remote.Image(ref, remote.WithAuthFromKeychain(kc))
32+
var defaultPlatform = pkgv1.Platform{
33+
Architecture: runtime.GOARCH,
34+
OS: runtime.GOOS,
35+
}
36+
img, err := remote.Image(ref, remote.WithAuthFromKeychain(kc), remote.WithPlatform(defaultPlatform))
3137
if err != nil {
3238
return nil, err
3339
}

0 commit comments

Comments
 (0)