Merge pull request #2028 from marcosnils/feat/detect_platform

Automatically detect target platform based on buildkit worker
This commit is contained in:
Andrea Luzzardi 2022-04-05 12:04:22 -07:00 committed by GitHub
commit 1428c94679
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 46 additions and 17 deletions

View File

@ -7,12 +7,15 @@ import (
"strings"
"sync"
"github.com/containerd/containerd/platforms"
"github.com/google/uuid"
"go.opentelemetry.io/otel/trace"
"golang.org/x/sync/errgroup"
"github.com/rs/zerolog/log"
specs "github.com/opencontainers/image-spec/specs-go/v1"
// Cue
// buildkit
@ -78,6 +81,15 @@ func (c *Client) Do(ctx context.Context, pctx *plancontext.Context, fn DoFunc) e
lg := log.Ctx(ctx)
eg, gctx := errgroup.WithContext(ctx)
// if platform is set through plan config, skip detection.
if !pctx.Platform.IsSet() {
p, err := c.detectPlatform(ctx)
if err != nil {
return err
}
pctx.Platform.Set(*p)
}
// Spawn print function
events := make(chan *bk.SolveStatus)
eg.Go(func() error {
@ -95,6 +107,26 @@ func (c *Client) Do(ctx context.Context, pctx *plancontext.Context, fn DoFunc) e
return eg.Wait()
}
// detectPlatform will try to automatically Buildkit's target platform.
// If not possible, default platform will be used.
func (c *Client) detectPlatform(ctx context.Context) (*specs.Platform, error) {
w, err := c.c.ListWorkers(ctx)
if err != nil {
return nil, fmt.Errorf("error detecting platform %w", err)
}
lg := log.Ctx(ctx)
if len(w) > 0 && len(w[0].Platforms) > 0 {
dPlatform := w[0].Platforms[0]
lg.Debug().
Str("platform", fmt.Sprintf("%s", dPlatform)).
Msg("platform detected automatically")
return &dPlatform, nil
}
defaultPlatform := platforms.DefaultSpec()
return &defaultPlatform, nil
}
func convertCacheOptionEntries(ims []bk.CacheOptionsEntry) []bkgw.CacheOptionsEntry {
convertIms := []bkgw.CacheOptionsEntry{}

View File

@ -123,7 +123,7 @@ func (p *Plan) configPlatform() error {
}
// Set platform to context
err = p.context.Platform.Set(platform)
err = p.context.Platform.SetString(platform)
if err != nil {
return err
}

View File

@ -17,9 +17,7 @@ type Context struct {
func New() *Context {
return &Context{
Platform: &platformContext{
platform: defaultPlatform,
},
Platform: &platformContext{},
FS: &fsContext{
store: make(map[string]*FS),
},

View File

@ -5,28 +5,27 @@ import (
specs "github.com/opencontainers/image-spec/specs-go/v1"
)
var (
// Default platform.
// FIXME: This should be auto detected using buildkit
defaultPlatform = specs.Platform{
OS: "linux",
Architecture: "amd64",
}
)
type platformContext struct {
platform specs.Platform
platform *specs.Platform
}
func (c *platformContext) Get() specs.Platform {
return c.platform
return *c.platform
}
func (c *platformContext) Set(platform string) error {
func (c *platformContext) SetString(platform string) error {
p, err := platforms.Parse(platform)
if err != nil {
return err
}
c.platform = p
c.platform = &p
return nil
}
func (c *platformContext) Set(p specs.Platform) {
c.platform = &p
}
func (c *platformContext) IsSet() bool {
return c.platform != nil
}