m/n/k/containerd: upgrade to v2
Upgrade containerd to 2.0, migrate config and adjust all paths.
No new K8s features are enabled yet, this will come separately.
Also bumps gVisor to the latest version and essentially reimplements the
shim as the API has changed a lot.
A drive-by fix in clitable was necessary as the x/tools upgrade
introduced a new analysis pass.
Change-Id: I9d25af203b94667aaac69a71eeccad2d42aa5f99
Reviewed-on: https://review.monogon.dev/c/monogon/+/3622
Tested-by: Jenkins CI
Reviewed-by: Jan Schär <jan@monogon.tech>
diff --git a/go/clitable/table_test.go b/go/clitable/table_test.go
index 447d83d..a84e8b1 100644
--- a/go/clitable/table_test.go
+++ b/go/clitable/table_test.go
@@ -38,8 +38,8 @@
golden = strings.TrimSpace(golden)
got := strings.TrimSpace(buf.String())
if got != golden {
- t.Logf("wanted: \n" + golden)
- t.Logf("got: \n" + got)
+ t.Logf("wanted: \n%s", golden)
+ t.Logf("got: \n%s", got)
t.Errorf("mismatch")
}
}