Switch all our tests to version 2

Also warn when someone uses version 1 Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-04-11 19:49:37 -04:00
parent 2a2d779594
commit 9ad087947d
8 changed files with 28 additions and 18 deletions
--- a/integration/client/daemon_config_linux_test.go
+++ b/integration/client/daemon_config_linux_test.go
@@ -129,9 +129,9 @@ func TestDaemonRuntimeRoot(t *testing.T) {
 		}
 	}()
 	configTOML := `
-version = 1
+version = 2
 [plugins]
- [plugins.cri]
+ [plugins."io.containerd.grpc.v1.cri"]
   stream_server_port = "0"
 `

@@ -227,7 +227,7 @@ func TestDaemonCustomCgroup(t *testing.T) {

 	customCgroup := fmt.Sprintf("%d", time.Now().Nanosecond())
 	configTOML := `
-version = 1
+version = 2
 [cgroup]
  path = "` + customCgroup + `"`