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/third_party/go/patches/cni-fix-cachepath.patch b/third_party/go/patches/cni-fix-cachepath.patch
index 65b30aa..06cf210 100644
--- a/third_party/go/patches/cni-fix-cachepath.patch
+++ b/third_party/go/patches/cni-fix-cachepath.patch
@@ -1,19 +1,4 @@
-Copyright 2020 The Monogon Project Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-From 0b2583e76ac9f9675bbd539485918c96da830d21 Mon Sep 17 00:00:00 2001
+From 3646de78ed303e1c84c78b676859df9c2db33863 Mon Sep 17 00:00:00 2001
From: Lorenz Brun <lorenz@brun.one>
Date: Mon, 25 Jan 2021 18:20:01 +0100
Subject: [PATCH] Point CacheDir to the correct location for Metropolis
@@ -27,18 +12,18 @@
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libcni/api.go b/libcni/api.go
-index 7e52bd8..7f3dfe6 100644
+index 5a43219..5d71426 100644
--- a/libcni/api.go
+++ b/libcni/api.go
-@@ -30,7 +30,7 @@ import (
+@@ -38,7 +38,7 @@ import (
)
var (
- CacheDir = "/var/lib/cni"
+ CacheDir = "/ephemeral/containerd/cni-cache"
+ // slightly awkward wording to preserve anyone matching on error strings
+ ErrorCheckNotSupp = fmt.Errorf("does not support the CHECK command")
)
-
- const (
--
-2.25.1
+2.44.1