Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion driver/kubernetes/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down
17 changes: 17 additions & 0 deletions driver/kubernetes/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading