From a41a2bfd23cfe54bd8c14dd8b79d1f3dc73d0325 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 20 Nov 2026 15:13:00 +0100 Subject: [PATCH] kubernetes: fix rootless BuildKit configuration Rootless BuildKit uses a different default configuration directory, so it ignores the buildkitd.toml mounted at /etc/buildkit by the Kubernetes driver. Pass the mounted configuration path explicitly when generating the pod arguments. Keep user flags last so an explicit --config still takes precedence, and leave arguments unchanged when no buildkitd.toml is supplied. Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- driver/kubernetes/manifest/manifest.go | 7 ++- driver/kubernetes/manifest/manifest_test.go | 61 +++++++++++++++++++++ 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/driver/kubernetes/manifest/manifest.go b/driver/kubernetes/manifest/manifest.go index 872cf0521959..f96db85e8ffa 100644 --- a/driver/kubernetes/manifest/manifest.go +++ b/driver/kubernetes/manifest/manifest.go @@ -29,7 +29,7 @@ type DeploymentOpt struct { } BuildkitFlags []string - // files mounted at /etc/buildkitd + // files mounted at /etc/buildkit ConfigFiles map[string][]byte BuildKitRootVolumeMemory string @@ -87,6 +87,11 @@ func NewDeployment(opt *DeploymentOpt) (d *appsv1.Deployment, s *appsv1.Stateful replicas := opt.Replicas privileged := true args := opt.BuildkitFlags + if _, ok := opt.ConfigFiles["buildkitd.toml"]; ok { + // Rootless BuildKit uses a different default config directory. + // Keep user flags last so an explicit --config takes precedence. + args = append([]string{"--config", "/etc/buildkit/buildkitd.toml"}, args...) + } if len(opt.Platforms) > 0 { annotations[AnnotationPlatform] = strings.Join(platformutil.Format(opt.Platforms), ",") diff --git a/driver/kubernetes/manifest/manifest_test.go b/driver/kubernetes/manifest/manifest_test.go index c4486dd43bf6..3a0127fa05a8 100644 --- a/driver/kubernetes/manifest/manifest_test.go +++ b/driver/kubernetes/manifest/manifest_test.go @@ -1,12 +1,73 @@ package manifest import ( + "fmt" "testing" "github.com/stretchr/testify/require" corev1 "k8s.io/api/core/v1" ) +func TestConfigFile(t *testing.T) { + for _, rootless := range []bool{false, true} { + for _, tc := range []struct { + name string + files map[string][]byte + flags []string + want []string + }{ + { + name: "no config", + flags: []string{"--debug"}, + want: []string{"--debug"}, + }, + { + name: "certificate only", + files: map[string][]byte{"certs/registry/ca.pem": []byte("certificate")}, + flags: []string{"--debug"}, + want: []string{"--debug"}, + }, + { + name: "config", + files: map[string][]byte{"buildkitd.toml": []byte("debug = true")}, + flags: []string{"--debug"}, + want: []string{"--config", "/etc/buildkit/buildkitd.toml", "--debug"}, + }, + { + name: "explicit config", + files: map[string][]byte{"buildkitd.toml": []byte("debug = true")}, + flags: []string{"--config", "/custom/buildkitd.toml"}, + want: []string{"--config", "/etc/buildkit/buildkitd.toml", "--config", "/custom/buildkitd.toml"}, + }, + } { + t.Run(fmt.Sprintf("rootless=%t/%s", rootless, tc.name), func(t *testing.T) { + opt := newBaseOpt() + opt.Rootless = rootless + opt.ConfigFiles = tc.files + opt.BuildkitFlags = tc.flags + d, _, configs, err := NewDeployment(opt) + require.NoError(t, err) + container := d.Spec.Template.Spec.Containers[0] + want := tc.want + if rootless { + want = append(want, "--oci-worker-no-process-sandbox") + } + require.Equal(t, want, container.Args) + if data, ok := tc.files["buildkitd.toml"]; ok { + mount := findVolumeMount(container.VolumeMounts, "/etc/buildkit") + require.NotNil(t, mount) + volume := findVolume(d.Spec.Template.Spec.Volumes, mount.Name) + require.NotNil(t, volume) + require.NotNil(t, volume.ConfigMap) + require.Len(t, configs, 1) + require.Equal(t, configs[0].Name, volume.ConfigMap.Name) + require.Equal(t, string(data), configs[0].Data["buildkitd.toml"]) + } + }) + } + } +} + func newBaseOpt() *DeploymentOpt { return &DeploymentOpt{ Namespace: "test-ns",