docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-21 11:17:44 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #368 from morlay/master

Browse Source 
feat: use k8s cluster config when buildx used in k8s cluster
This commit is contained in:
Tõnis Tiigi 2020-08-29 12:15:17 -07:00 committed by GitHub
commit ee34eb2180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commands/util.go
View File

@ -177,7 +177,9 @@ func driversForNodeGroup(ctx context.Context, dockerCli command.Cli, ng *store.N
dockerapi.NegotiateAPIVersion(ctx) dockerapi.NegotiateAPIVersion(ctx)
contextStore := dockerCli.ContextStore() contextStore := dockerCli.ContextStore()
kcc, err := kubernetes.ConfigFromContext(n.Endpoint, contextStore)
var kcc driver.KubeClientConfig
kcc, err = kubernetes.ConfigFromContext(n.Endpoint, contextStore)
if err != nil { if err != nil {
// err is returned if n.Endpoint is non-context name like "unix:///var/run/docker.sock". // err is returned if n.Endpoint is non-context name like "unix:///var/run/docker.sock".
// try again with name="default". // try again with name="default".
@ -187,6 +189,10 @@ func driversForNodeGroup(ctx context.Context, dockerCli command.Cli, ng *store.N
logrus.Error(err) logrus.Error(err)
} }
} }
if kcc == nil {
kcc = driver.KubeClientConfigInCluster{}
}
d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, f, dockerapi, kcc, n.Flags, n.ConfigFile, n.DriverOpts, contextPathHash) d, err := driver.GetDriver(ctx, "buildx_buildkit_"+n.Name, f, dockerapi, kcc, n.Flags, n.ConfigFile, n.DriverOpts, contextPathHash)
if err != nil { if err != nil {
di.Err = err di.Err = err

28
driver/manager.go
View File

@ -2,11 +2,14 @@ package driver
import ( import (
"context" "context"
"io/ioutil"
"sort" "sort"
"strings"
"k8s.io/client-go/rest"
dockerclient "github.com/docker/docker/client" dockerclient "github.com/docker/docker/client"
"github.com/pkg/errors" "github.com/pkg/errors"
"k8s.io/client-go/tools/clientcmd"
) )
type Factory interface { type Factory interface {
@ -22,11 +25,30 @@ type BuildkitConfig struct {
// Rootless bool // Rootless bool
} }
type KubeClientConfig interface {
ClientConfig() (*rest.Config, error)
Namespace() (string, bool, error)
}
type KubeClientConfigInCluster struct{}
func (k KubeClientConfigInCluster) ClientConfig() (*rest.Config, error) {
return rest.InClusterConfig()
}
func (k KubeClientConfigInCluster) Namespace() (string, bool, error) {
namespace, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
if err != nil {
return "", false, err
}
return strings.TrimSpace(string(namespace)), true, nil
}
type InitConfig struct { type InitConfig struct {
// This object needs updates to be generic for different drivers // This object needs updates to be generic for different drivers
Name string Name string
DockerAPI dockerclient.APIClient DockerAPI dockerclient.APIClient
KubeClientConfig clientcmd.ClientConfig KubeClientConfig KubeClientConfig
BuildkitFlags []string BuildkitFlags []string
ConfigFile string ConfigFile string
DriverOpts map[string]string DriverOpts map[string]string
@ -76,7 +98,7 @@ func GetFactory(name string, instanceRequired bool) Factory {
return nil return nil
} }
func GetDriver(ctx context.Context, name string, f Factory, api dockerclient.APIClient, kcc clientcmd.ClientConfig, flags []string, config string, do map[string]string, contextPathHash string) (Driver, error) { func GetDriver(ctx context.Context, name string, f Factory, api dockerclient.APIClient, kcc KubeClientConfig, flags []string, config string, do map[string]string, contextPathHash string) (Driver, error) {
ic := InitConfig{ ic := InitConfig{
DockerAPI: api, DockerAPI: api,
KubeClientConfig: kcc, KubeClientConfig: kcc,