refactor global config to allow buildx builders

GoogleContainerTools · Jan 18, 2025 · 0611204 · 0611204
1 parent 44fb72c
commit 0611204
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/pkg/skaffold/build/docker/docker.go b/pkg/skaffold/build/docker/docker.go
@@ -139,6 +139,10 @@ func (b *Builder) dockerCLIBuild(ctx context.Context, out io.Writer, name string
 		}
 	}
 
+	if b.buildx {
+		args = append(args, "--builder", config.GetBuildXBuilder(b.cfg.GlobalConfig()))
+	}
+
 	// temporary file for buildx metadata containing the image digest:
 	var metadata string
 	if b.buildx {

diff --git a/pkg/skaffold/build/docker/docker_test.go b/pkg/skaffold/build/docker/docker_test.go
@@ -96,7 +96,7 @@ func TestDockerCLIBuild(t *testing.T) {
 			buildx:           true,
 			daemonless:       false,
 			imageName:        "gcr.io/k8s-skaffold/example:tag",
-			expectedCLIFlags: []string{"--cache-from", "gcr.io/k8s-skaffold/example:cache", "--load", "--metadata-file", "metadata.json"},
+			expectedCLIFlags: []string{"--cache-from", "gcr.io/k8s-skaffold/example:cache", "--load", "--builder", "default", "--metadata-file", "metadata.json"},
 			expectedEnv:      []string{"KEY=VALUE", "DOCKER_BUILDKIT=1"},
 		},
 		{
@@ -106,7 +106,7 @@ func TestDockerCLIBuild(t *testing.T) {
 			buildx:           true,
 			daemonless:       true,
 			imageName:        "gcr.io/k8s-skaffold/example:tag",
-			expectedCLIFlags: []string{"--cache-from", "gcr.io/k8s-skaffold/example:cache", "--cache-to", "type=registry,ref=gcr.io/k8s-skaffold/example:cache,mode=max", "--push", "--metadata-file", "metadata.json"},
+			expectedCLIFlags: []string{"--cache-from", "gcr.io/k8s-skaffold/example:cache", "--cache-to", "type=registry,ref=gcr.io/k8s-skaffold/example:cache,mode=max", "--push", "--builder", "default", "--metadata-file", "metadata.json"},
 			expectedEnv:      []string{"KEY=VALUE", "DOCKER_BUILDKIT=1"},
 		},
 		{
@@ -195,7 +195,7 @@ func TestDockerCLIBuild(t *testing.T) {
 				return os.Open("metadata.json")
 			})
 			t.Override(&config.GetConfigForCurrentKubectx, func(configFile string) (*config.ContextConfig, error) {
-				return &config.ContextConfig{CacheTag: "cache"}, nil
+				return &config.ContextConfig{CacheTag: "cache", BuildXBuilder: "default"}, nil
 			})
 			var mockCmd *testutil.FakeCmd
 

diff --git a/pkg/skaffold/config/global_config.go b/pkg/skaffold/config/global_config.go
@@ -34,7 +34,7 @@ type ContextConfig struct {
 	// DebugHelpersRegistry is the registry from which the debug helper images are used.
 	DebugHelpersRegistry string        `yaml:"debug-helpers-registry,omitempty"`
 	CacheTag             string        `yaml:"cache-tag,omitempty"`
-	DetectBuildX         *bool         `yaml:"detect-buildx,omitempty"`
+	BuildXBuilder        string        `yaml:"buildx-builder,omitempty"`
 	UpdateCheck          *bool         `yaml:"update-check,omitempty"`
 	Survey               *SurveyConfig `yaml:"survey,omitempty"`
 	KindDisableLoad      *bool         `yaml:"kind-disable-load,omitempty"`

diff --git a/pkg/skaffold/config/util.go b/pkg/skaffold/config/util.go
@@ -229,15 +229,19 @@ func GetCacheTag(configFile string) (string, error) {
 	return cfg.CacheTag, nil
 }
 
-func GetDetectBuildX(configFile string) bool {
+func GetBuildXBuilder(configFile string) string {
 	cfg, err := GetConfigForCurrentKubectx(configFile)
 	if err != nil {
-		log.Entry(context.TODO()).Errorf("Cannot read detect-buildx option from config: %v", err)
-	} else if cfg.DetectBuildX != nil {
-		log.Entry(context.TODO()).Infof("Using detect-buildx=%t from config", *cfg.DetectBuildX)
-		return *cfg.DetectBuildX
+		log.Entry(context.TODO()).Errorf("Cannot read buildx-builder option from config: %v", err)
+	} else if cfg.BuildXBuilder != "" {
+		log.Entry(context.TODO()).Infof("Using buildx-builder=%s from config", cfg.BuildXBuilder)
+		return cfg.BuildXBuilder
 	}
-	return false
+	return ""
+}
+
+func GetDetectBuildX(configFile string) bool {
+	return GetBuildXBuilder(configFile) != ""
 }
 
 type GetClusterOpts struct {