Merge pull request #43872 from thaJeztah/containerd_config_v2

libcontainerd: switch generated containerd.toml to v2 (v1 is deprecated)

cmd/dockerd/daemon.go

@@ -596,7 +596,7 @@ func (cli *DaemonCli) getContainerdDaemonOpts() ([]supervisor.DaemonOpt, error)
 	}
 
 	if !cli.Config.CriContainerd {
-		opts = append(opts, supervisor.WithPlugin("cri", nil))
+		opts = append(opts, supervisor.WithPlugin("io.containerd.grpc.v1.cri", nil))
 	}
 
 	return opts, nil

libcontainerd/supervisor/remote_daemon.go

@@ -62,8 +62,9 @@ func Start(ctx context.Context, rootDir, stateDir string, opts ...DaemonOpt) (Da
 		rootDir:  rootDir,
 		stateDir: stateDir,
 		Config: config.Config{
-			Root:  filepath.Join(rootDir, "daemon"),
-			State: filepath.Join(stateDir, "daemon"),
+			Version: 2,
+			Root:    filepath.Join(rootDir, "daemon"),
+			State:   filepath.Join(stateDir, "daemon"),
 		},
 		Plugins:       make(map[string]interface{}),
 		daemonPid:     -1,