From 05177a6ce96be42cacf13750194a30b176150c46 Mon Sep 17 00:00:00 2001 From: Dean Chen <862469039@qq.com> Date: Wed, 23 Sep 2026 08:59:55 +0500 Subject: [PATCH] kubernetes: pass --config for a mounted buildkitd.toml Rootless buildkitd does not read /etc/buildkit by default, so a buildkitd-config-inline file was mounted and then ignored. Point --config at that file, ahead of any user flags. Signed-off-by: Dean Chen <862469039@qq.com> --- driver/kubernetes/factory.go | 14 +++++++++++++- driver/kubernetes/factory_test.go | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/driver/kubernetes/factory.go b/driver/kubernetes/factory.go index c13a721a19e4..71a54f14638e 100644 --- a/driver/kubernetes/factory.go +++ b/driver/kubernetes/factory.go @@ -24,8 +24,20 @@ const ( prioritySupported = 40 priorityUnsupported = 80 defaultTimeout = 120 * time.Second + buildkitdConfigFile = "buildkitd.toml" ) +// buildkitFlags points buildkitd at the mounted config. The rootless image +// does not read /etc/buildkit by default, so without --config the file is +// ignored. User flags come after and can override this. +func buildkitFlags(cfg driver.InitConfig) []string { + flags := cfg.BuildkitdFlags + if _, ok := cfg.Files[buildkitdConfigFile]; !ok { + return flags + } + return append([]string{"--config", "/etc/buildkit/" + buildkitdConfigFile}, flags...) +} + type ClientConfig interface { ClientConfig() (*rest.Config, error) Namespace() (string, bool, error) @@ -171,7 +183,7 @@ func (f *factory) processDriverOpts(deploymentName string, namespace string, cfg Name: deploymentName, Image: bkimage.DefaultImage, Replicas: 1, - BuildkitFlags: cfg.BuildkitdFlags, + BuildkitFlags: buildkitFlags(cfg), Rootless: false, Platforms: cfg.Platforms, ConfigFiles: cfg.Files, diff --git a/driver/kubernetes/factory_test.go b/driver/kubernetes/factory_test.go index 988be6abc21e..c3b6242a4061 100644 --- a/driver/kubernetes/factory_test.go +++ b/driver/kubernetes/factory_test.go @@ -168,6 +168,23 @@ func TestFactory_processDriverOpts(t *testing.T) { }, ) + t.Run( + "ConfigFileFlag", func(t *testing.T) { + cfg.Files = map[string][]byte{ + "buildkitd.toml": []byte("debug = true\n"), + } + cfg.BuildkitdFlags = []string{"--debug"} + cfg.DriverOpts = map[string]string{} + + r, _, _, _, _, err := f.processDriverOpts(cfg.Name, "test", cfg) + require.NoError(t, err) + require.Equal(t, []string{"--config", "/etc/buildkit/buildkitd.toml", "--debug"}, r.BuildkitFlags) + + cfg.Files = nil + cfg.BuildkitdFlags = nil + }, + ) + t.Run( "InvalidReplicas", func(t *testing.T) { cfg.DriverOpts = map[string]string{