chore: support gcr.io auth for cache and image gen

Support gcr.io auth for cache and image gen. Signed-off-by: Noel Georgi <git@frezbo.dev>
siderolabs · Dec 19, 2024 · f756043 · f756043
1 parent 6ef2596
commit f756043
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/pkg/imager/cache/cache.go b/pkg/imager/cache/cache.go
@@ -24,6 +24,7 @@ import (
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/cache"
 	"github.com/google/go-containerregistry/pkg/v1/empty"
+	"github.com/google/go-containerregistry/pkg/v1/google"
 	"github.com/google/go-containerregistry/pkg/v1/layout"
 	"github.com/google/go-containerregistry/pkg/v1/mutate"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
@@ -87,6 +88,7 @@ func Generate(images []string, platform string, insecure bool, imageLayerCachePa
 			authn.NewMultiKeychain(
 				authn.DefaultKeychain,
 				github.Keychain,
+				google.Keychain,
 			),
 		),
 	}
@@ -95,6 +97,7 @@ func Generate(images []string, platform string, insecure bool, imageLayerCachePa
 		remote.WithAuthFromKeychain(authn.NewMultiKeychain(
 			authn.DefaultKeychain,
 			github.Keychain,
+			google.Keychain,
 		)),
 		remote.WithPlatform(*v1Platform),
 	}

diff --git a/pkg/imager/profile/input.go b/pkg/imager/profile/input.go
@@ -16,6 +16,7 @@ import (
 	"github.com/google/go-containerregistry/pkg/authn/github"
 	"github.com/google/go-containerregistry/pkg/crane"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
+	"github.com/google/go-containerregistry/pkg/v1/google"
 	"github.com/google/go-containerregistry/pkg/v1/layout"
 	"github.com/siderolabs/gen/value"
 	"golang.org/x/sync/errgroup"
@@ -280,6 +281,7 @@ func (c *ContainerAsset) Pull(ctx context.Context, arch string, printf func(stri
 			authn.NewMultiKeychain(
 				authn.DefaultKeychain,
 				github.Keychain,
+				google.Keychain,
 			),
 		),
 	}