Merge pull request #10907 from AkihiroSuda/fix-10905

config: v1Migrate: support DisabledPlugins and RequiredPlugins

cmd/containerd/server/config/config.go

@@ -133,7 +133,12 @@ func (c *Config) ValidateVersion() error {
 
 // MigrateConfig will convert the config to the latest version before using
 func (c *Config) MigrateConfig(ctx context.Context) error {
-	for c.Version < version.ConfigVersion {
+	return c.MigrateConfigTo(ctx, version.ConfigVersion)
+}
+
+// MigrateConfigTo will convert the config to the target version before using
+func (c *Config) MigrateConfigTo(ctx context.Context, targetVersion int) error {
+	for c.Version < targetVersion {
 		if m := migrations[c.Version]; m != nil {
 			if err := m(ctx, c); err != nil {
 				return err
@@ -144,9 +149,7 @@ func (c *Config) MigrateConfig(ctx context.Context) error {
 	return nil
 }
 
-func v1Migrate(ctx context.Context, c *Config) error {
+func v1MigratePluginName(ctx context.Context, plugin string) string {
-	plugins := make(map[string]interface{}, len(c.Plugins))
-
 	// corePlugins is the list of used plugins before v1 was deprecated
 	corePlugins := map[string]string{
 		"cri":       "io.containerd.grpc.v1.cri",
@@ -166,28 +169,40 @@ func v1Migrate(ctx context.Context, c *Config) error {
 		"overlayfs": "io.containerd.snapshotter.v1.overlayfs",
 		"zfs":       "io.containerd.snapshotter.v1.zfs",
 	}
-	for plugin, value := range c.Plugins {
+	if !strings.ContainsAny(plugin, ".") {
-		if !strings.ContainsAny(plugin, ".") {
+		var ambiguous string
-			var ambiguous string
+		if full, ok := corePlugins[plugin]; ok {
-			if full, ok := corePlugins[plugin]; ok {
+			plugin = full
-				plugin = full
+		} else if strings.HasSuffix(plugin, "-service") {
-			} else if strings.HasSuffix(plugin, "-service") {
+			plugin = "io.containerd.service.v1." + plugin
-				plugin = "io.containerd.service.v1." + plugin
+		} else if plugin == "windows" || plugin == "windows-lcow" {
-			} else if plugin == "windows" || plugin == "windows-lcow" {
+			// runtime, differ, and snapshotter plugins do not have configs for v1
-				// runtime, differ, and snapshotter plugins do not have configs for v1
+			ambiguous = plugin
-				ambiguous = plugin
+			plugin = "io.containerd.snapshotter.v1." + plugin
-				plugin = "io.containerd.snapshotter.v1." + plugin
+		} else {
-			} else {
+			ambiguous = plugin
-				ambiguous = plugin
+			plugin = "io.containerd.grpc.v1." + plugin
-				plugin = "io.containerd.grpc.v1." + plugin
-			}
-			if ambiguous != "" {
-				log.G(ctx).Warnf("Ambiguous %s plugin in v1 config, treating as %s", ambiguous, plugin)
-			}
 		}
-		plugins[plugin] = value
+		if ambiguous != "" {
+			log.G(ctx).Warnf("Ambiguous %s plugin in v1 config, treating as %s", ambiguous, plugin)
+		}
+	}
+	return plugin
+}
+
+func v1Migrate(ctx context.Context, c *Config) error {
+	plugins := make(map[string]interface{}, len(c.Plugins))
+	for plugin, value := range c.Plugins {
+		plugins[v1MigratePluginName(ctx, plugin)] = value
 	}
 	c.Plugins = plugins
+	for i, plugin := range c.DisabledPlugins {
+		c.DisabledPlugins[i] = v1MigratePluginName(ctx, plugin)
+	}
+	for i, plugin := range c.RequiredPlugins {
+		c.RequiredPlugins[i] = v1MigratePluginName(ctx, plugin)
+	}
+	// No change in c.ProxyPlugins
 	return nil
 }
 
@@ -297,6 +312,15 @@ func LoadConfig(ctx context.Context, path string, out *Config) error {
 			return err
 		}
 
+		switch config.Version {
+		case 0, 1:
+			if err := config.MigrateConfigTo(ctx, out.Version); err != nil {
+				return err
+			}
+		default:
+			// NOP
+		}
+
 		if err := mergeConfig(out, config); err != nil {
 			return err
 		}

cmd/containerd/server/config/config_test.go

@@ -214,6 +214,25 @@ imports = ["data1.toml", "data2.toml"]
 	}, out.Imports)
 }
 
+// https://github.com/containerd/containerd/issues/10905
+func TestLoadConfigWithDefaultConfigVersion(t *testing.T) {
+	data1 := `
+disabled_plugins=["cri"]
+`
+	tempDir := t.TempDir()
+
+	err := os.WriteFile(filepath.Join(tempDir, "data1.toml"), []byte(data1), 0o600)
+	assert.NoError(t, err)
+
+	var out Config
+	out.Version = version.ConfigVersion
+	err = LoadConfig(context.Background(), filepath.Join(tempDir, "data1.toml"), &out)
+	assert.NoError(t, err)
+
+	assert.Equal(t, version.ConfigVersion, out.Version)
+	assert.Equal(t, []string{"io.containerd.grpc.v1.cri"}, out.DisabledPlugins)
+}
+
 func TestDecodePlugin(t *testing.T) {
 	ctx := logtest.WithT(context.Background(), t)
 	data := `