cdi: fixes since enabled by default

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

client/client_test.go

@@ -277,12 +277,7 @@ func testIntegration(t *testing.T, funcs ...func(t *testing.T, sb integration.Sa
 
 	integration.Run(t, integration.TestFuncs(
 		testCDI,
-	),
-		mirrors,
-		integration.WithMatrix("cdi", map[string]interface{}{
-			"enabled": enableCDI,
-		}),
-	)
+	), mirrors)
 }
 
 func newContainerd(cdAddress string) (*ctd.Client, error) {
@@ -10996,19 +10991,6 @@ func (w warningsListOutput) String() string {
 	return b.String()
 }
 
-type cdiEnabled struct{}
-
-func (*cdiEnabled) UpdateConfigFile(in string) string {
-	return in + `
-[cdi]
-enabled = true
-`
-}
-
-var (
-	enableCDI integration.ConfigUpdater = &cdiEnabled{}
-)
-
 func testCDI(t *testing.T, sb integration.Sandbox) {
 	if sb.Rootless() {
 		t.SkipNow()

cmd/buildkitd/main.go

@@ -217,8 +217,8 @@ func main() {
 			Usage: "OTEL collector trace socket path",
 		},
 		cli.BoolFlag{
-			Name:  "cdi-enabled",
-			Usage: "enables support of the Container Device Interface (CDI)",
+			Name:  "cdi-disabled",
+			Usage: "disables support of the Container Device Interface (CDI)",
 		},
 		cli.StringSliceFlag{
 			Name:  "cdi-spec-dir",
@@ -631,9 +631,9 @@ func applyMainFlags(c *cli.Context, cfg *config.Config) error {
 		cfg.OTEL.SocketPath = c.String("otel-socket-path")
 	}
 
-	if c.IsSet("cdi-enabled") {
-		cdiEnabled := c.Bool("cdi-enabled")
-		cfg.CDI.Disabled = &cdiEnabled
+	if c.IsSet("cdi-disabled") {
+		cdiDisabled := c.Bool("cdi-disabled")
+		cfg.CDI.Disabled = &cdiDisabled
 	}
 	if c.IsSet("cdi-spec-dir") {
 		cfg.CDI.SpecDirs = c.StringSlice("cdi-spec-dir")

docs/buildkitd.toml.md

@@ -47,8 +47,8 @@ insecure-entitlements = [ "network.host", "security.insecure" ]
   socketPath = "/run/buildkit/otel-grpc.sock"
 
 [cdi]
-  # Enables support of the Container Device Interface (CDI).
-  enabled = true
+  # Disables support of the Container Device Interface (CDI).
+  disabled = true
   # List of directories to scan for CDI spec files. For more details about CDI
   # specification, please refer to https://github.com/cncf-tags/container-device-interface/blob/main/SPEC.md#cdi-json-specification
   specDirs = ["/etc/cdi", "/var/run/cdi", "/etc/buildkit/cdi"]

frontend/dockerfile/dockerfile_test.go

@@ -302,10 +302,7 @@ func TestIntegration(t *testing.T) {
 			"denied":  networkHostDenied,
 		}))...)
 
-	integration.Run(t, deviceTests, append(opts,
-		integration.WithMatrix("cdi", map[string]interface{}{
-			"enabled": enableCDI,
-		}))...)
+	integration.Run(t, deviceTests, opts...)
 }
 
 func testEmptyStringArgInEnv(t *testing.T, sb integration.Sandbox) {
@@ -9902,19 +9899,6 @@ var (
 	networkHostDenied  integration.ConfigUpdater = &networkModeSandbox{}
 )
 
-type cdiEnabled struct{}
-
-func (*cdiEnabled) UpdateConfigFile(in string) string {
-	return in + `
-[cdi]
-enabled = true
-`
-}
-
-var (
-	enableCDI integration.ConfigUpdater = &cdiEnabled{}
-)
-
 func fixedWriteCloser(wc io.WriteCloser) filesync.FileOutputFunc {
 	return func(map[string]string) (io.WriteCloser, error) {
 		return wc, nil