summaryrefslogtreecommitdiffhomepage
path: root/pkg/shim
diff options
context:
space:
mode:
authorzeddy <zeddy@digitalocean.com>2021-08-05 09:49:09 -0600
committerzeddy <zeddy@digitalocean.com>2021-08-16 19:38:04 -0700
commit0f62f21527b9014653de07fa366fb5b0f48fb16c (patch)
tree80df3117868b0458492db6c6f9e272203f21684e /pkg/shim
parentbb13d015a4ffcedac42cce05ec9f1ff4728d12d7 (diff)
Support runtime options type used in containerd v1.5
Diffstat (limited to 'pkg/shim')
-rw-r--r--pkg/shim/runtimeoptions/runtimeoptions.go7
1 files changed, 7 insertions, 0 deletions
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")
+}