Add support for containerd 1.5

"cri.runtimeoptions.v1" moved to "runtimeoptions.v1" and containerd
configuration format version 2 is required.

Updates #6449

PiperOrigin-RevId: 404671168

.buildkite/pipeline.yaml

@@ -98,6 +98,9 @@ steps:
   - <<: *common
     label: ":docker: Containerd 1.4.3 tests"
     command: make containerd-test-1.4.3
+  - <<: *common
+    label: ":docker: Containerd 1.5.4 tests"
+    command: make containerd-test-1.5.4
 
   # Check the website builds.
   - <<: *common

Makefile

@@ -309,6 +309,7 @@ containerd-test-%: load-basic_alpine load-basic_python load-basic_busybox load-b
 containerd-tests: ## Runs all supported containerd version tests.
 containerd-tests: containerd-test-1.3.9
 containerd-tests: containerd-test-1.4.3
+containerd-tests: containerd-test-1.5.4
 
 ##
 ## Benchmarks.

nogo.yaml

@@ -66,6 +66,7 @@ global:
     exclude:
       # Generated: exempt all.
       - pkg/shim/runtimeoptions/runtimeoptions_cri.go
+      - pkg/shim/runtimeoptions/v14/runtimeoptions_cri.go
 analyzers:
   asmdecl:
     external: # Enabled.

pkg/shim/BUILD

@@ -19,6 +19,7 @@ go_library(
         "//pkg/shim/proc",
         "//pkg/shim/runsc",
         "//pkg/shim/runtimeoptions",
+        "//pkg/shim/runtimeoptions/v14",
         "//pkg/shim/utils",
         "//runsc/specutils",
         "@com_github_burntsushi_toml//:go_default_library",

pkg/shim/runtimeoptions/runtimeoptions.go

@@ -13,12 +13,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package runtimeoptions contains the runtimeoptions proto.
+// Package runtimeoptions contains the runtimeoptions proto for containerd 1.5
+// and above.
 package runtimeoptions
-
-import proto "github.com/gogo/protobuf/proto"
-
-func init() {
-	// TODO(gvisor.dev/issue/6449): Upgrade runtimeoptions.proto after upgrading to containerd 1.5
-	proto.RegisterType((*Options)(nil), "runtimeoptions.v1.Options")
-}

pkg/shim/runtimeoptions/runtimeoptions.proto

@@ -14,12 +14,16 @@
 
 syntax = "proto3";
 
-package cri.runtimeoptions.v1;
+package runtimeoptions.v1;
 
 // This is a version of the runtimeoptions CRI API that is vendored.
+// Source: cri/pkg/api/runtimeoptions/v1/api.proto
 //
 // Importing the full CRI package is a nightmare.
 message Options {
+  // TypeUrl specifies the type of the content inside the config file.
   string type_url = 1;
+  // ConfigPath specifies the filesystem location of the config file
+  // used by the runtime.
   string config_path = 2;
 }