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

Merge pull request #1957 from crazy-max/v0.11_backport_fix-kube-config

Browse Source
This commit is contained in:
Justin Chadwell 2023-07-18 15:16:29 +01:00 committed by GitHub
commit 66fd2bbdee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/node.go
View File

@ -82,12 +82,12 @@ func (b *Builder) LoadNodes(ctx context.Context, withData bool) (_ []Node, err e
contextStore := b.opts.dockerCli.ContextStore() contextStore := b.opts.dockerCli.ContextStore()
var kcc driver.KubeClientConfig var kcc driver.KubeClientConfig
kcc, err = ctxkube.ConfigFromContext(n.Endpoint, contextStore) kcc, err = ctxkube.ConfigFromEndpoint(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".
// FIXME(@AkihiroSuda): n should retain real context name. // FIXME(@AkihiroSuda): n should retain real context name.
kcc, err = ctxkube.ConfigFromContext("default", contextStore) kcc, err = ctxkube.ConfigFromEndpoint("default", contextStore)
if err != nil { if err != nil {
logrus.Error(err) logrus.Error(err)
} }