From 0f62f21527b9014653de07fa366fb5b0f48fb16c Mon Sep 17 00:00:00 2001 From: zeddy Date: Thu, 5 Aug 2021 09:49:09 -0600 Subject: Support runtime options type used in containerd v1.5 --- pkg/shim/runtimeoptions/runtimeoptions.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/shim/runtimeoptions/runtimeoptions.go b/pkg/shim/runtimeoptions/runtimeoptions.go index 072dd87f0..e76d73ea7 100644 --- a/pkg/shim/runtimeoptions/runtimeoptions.go +++ b/pkg/shim/runtimeoptions/runtimeoptions.go @@ -15,3 +15,10 @@ // Package runtimeoptions contains the runtimeoptions proto. 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") +} -- cgit v1.2.3