Allow sending credentials to namespace systems registries (#1381)

Author: InverseIntegral

internal/cli/cmd/cluster/build.go

@@ -497,7 +497,7 @@ func startSingleBuild(eg *executor.Executor, c *client.Client, mw *progresswrite
 type keychain struct{}
 
 func (dk keychain) Resolve(ctx context.Context, r authn.Resource) (authn.Authenticator, error) {
-	if strings.HasSuffix(r.RegistryStr(), ".nscluster.cloud") || r.RegistryStr() == "nscr.io" {
+	if strings.HasSuffix(r.RegistryStr(), ".nscluster.cloud") || strings.HasSuffix(r.RegistryStr(), ".namespace.systems") || r.RegistryStr() == "nscr.io" {
 		return api.RegistryCreds(ctx)
 	}
 

internal/providers/nscloud/api/creds.go

@@ -17,7 +17,7 @@ var DefaultKeychain oci.Keychain = defaultKeychain{}
 type defaultKeychain struct{}
 
 func (dk defaultKeychain) Resolve(ctx context.Context, r authn.Resource) (authn.Authenticator, error) {
-	if strings.HasSuffix(r.RegistryStr(), ".nscluster.cloud") || r.RegistryStr() == "nscr.io" {
+	if strings.HasSuffix(r.RegistryStr(), ".nscluster.cloud") || strings.HasSuffix(r.RegistryStr(), ".namespace.systems") || r.RegistryStr() == "nscr.io" {
 		return RegistryCreds(ctx)
 	}
 

internal/providers/nscloud/buildcluster.go

@@ -11,7 +11,7 @@ import (
 	"namespacelabs.dev/foundation/internal/providers/nscloud/api"
 )
 
-func EnsureBuildCluster(ctx context.Context, x api.API) (*buildkit.Overrides, error) {
+func EnsureBuildCluster(ctx context.Context, _ api.API) (*buildkit.Overrides, error) {
 	cfg, err := api.EnsureBuildCluster(ctx, "amd64")
 	if err != nil {
 		return nil, err

internal/providers/nscloud/registry.go

@@ -17,7 +17,7 @@ import (
 	"namespacelabs.dev/foundation/std/tasks"
 )
 
-var DefaultKeychain oci.Keychain = api.DefaultKeychain
+var DefaultKeychain = api.DefaultKeychain
 
 type nscloudRegistry struct {
 	registry *api.ImageRegistry