diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2020-08-19 11:43:24 -0700 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2020-09-09 17:53:10 -0700 |
| commit | 55ad34a05b5b1a36e89d2269c9ca4918f81adf48 (patch) | |
| tree | b331047f387a42627f5516c1d84616e9e670513f /pkg/shim/v2/runtimeoptions/runtimeoptions.go | |
| parent | da96ad6bacd604f535ea21d7e559e8501087d227 (diff) | |
Change runtimeoptions proto handling.
Stolen from cl/327337408 (ascannell is OOO)
PiperOrigin-RevId: 327475423
Diffstat (limited to 'pkg/shim/v2/runtimeoptions/runtimeoptions.go')
| -rw-r--r-- | pkg/shim/v2/runtimeoptions/runtimeoptions.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/shim/v2/runtimeoptions/runtimeoptions.go b/pkg/shim/v2/runtimeoptions/runtimeoptions.go index 1c1a0c5d1..aaf17b87a 100644 --- a/pkg/shim/v2/runtimeoptions/runtimeoptions.go +++ b/pkg/shim/v2/runtimeoptions/runtimeoptions.go @@ -23,5 +23,8 @@ import ( type Options = pb.Options func init() { + // The generated proto file auto registers with "golang/protobuf/proto" + // package. However, typeurl uses "golang/gogo/protobuf/proto". So registers + // the type there too. proto.RegisterType((*Options)(nil), "cri.runtimeoptions.v1.Options") } |