diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-08-27 13:08:21 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-27 13:08:21 -0700 |
| commit | 0db19ea910def9848d0f53f65f993270ed579a8f (patch) | |
| tree | 1b89f0d97cfe4a61fadea6273a3880a1e7082c4e | |
| parent | fbf020d6a0258275a68573032bea225a1f5396ab (diff) | |
| parent | 0f62f21527b9014653de07fa366fb5b0f48fb16c (diff) | |
Merge pull request #6415 from ZachEddy:containerd-runtime-options-v1.5
PiperOrigin-RevId: 393411409
| -rw-r--r-- | pkg/shim/runtimeoptions/runtimeoptions.go | 7 |
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") +} |