diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-08-19 18:50:28 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-19 18:50:28 +0000 |
| commit | c6270a39b6894126f3508d25d0ed19792bd0213c (patch) | |
| tree | 12bbf977cc844293b25ca6e4cb99865bcbf6897d /pkg/shim | |
| parent | 2e7d866f50f6cdbcb20d6bb26fdee691ac977792 (diff) | |
| parent | 41777e90ea6a48eadbfdedc71029a634e1a23b5f (diff) | |
Merge release-20200810.0-62-g41777e90e (automated)
Diffstat (limited to 'pkg/shim')
| -rw-r--r-- | pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go | 19 | ||||
| -rw-r--r-- | pkg/shim/v2/runtimeoptions/runtimeoptions.go | 3 |
2 files changed, 13 insertions, 9 deletions
diff --git a/pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go b/pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go index fa758dc8a..ecbdd2282 100644 --- a/pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go +++ b/pkg/shim/v2/runtimeoptions/api_go_proto/runtimeoptions.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: pkg/shim/v2/runtimeoptions/runtimeoptions.proto -package runtimeoptions +package cri_runtimeoptions_v1 import ( fmt "fmt" @@ -68,7 +68,7 @@ func (m *Options) GetConfigPath() string { } func init() { - proto.RegisterType((*Options)(nil), "runtimeoptions.Options") + proto.RegisterType((*Options)(nil), "cri.runtimeoptions.v1.Options") } func init() { @@ -76,13 +76,14 @@ func init() { } var fileDescriptor_66926f9a3a61f972 = []byte{ - // 126 bytes of a gzipped FileDescriptorProto + // 132 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x2f, 0xc8, 0x4e, 0xd7, 0x2f, 0xce, 0xc8, 0xcc, 0xd5, 0x2f, 0x33, 0xd2, 0x2f, 0x2a, 0xcd, 0x2b, 0xc9, 0xcc, 0x4d, 0xcd, - 0x2f, 0x28, 0xc9, 0xcc, 0xcf, 0x2b, 0x46, 0xe3, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0xf1, - 0xa1, 0x8a, 0x2a, 0xb9, 0x72, 0xb1, 0xfb, 0x43, 0x98, 0x42, 0x92, 0x5c, 0x1c, 0x25, 0x95, 0x05, - 0xa9, 0xf1, 0xa5, 0x45, 0x39, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0xec, 0x20, 0x7e, 0x68, - 0x51, 0x8e, 0x90, 0x3c, 0x17, 0x77, 0x72, 0x7e, 0x5e, 0x5a, 0x66, 0x7a, 0x7c, 0x41, 0x62, 0x49, - 0x86, 0x04, 0x13, 0x58, 0x96, 0x0b, 0x22, 0x14, 0x90, 0x58, 0x92, 0x91, 0xc4, 0x06, 0x36, 0xdd, - 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x49, 0x66, 0xf6, 0x4d, 0x90, 0x00, 0x00, 0x00, + 0x2f, 0x28, 0xc9, 0xcc, 0xcf, 0x2b, 0x46, 0xe3, 0xea, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x89, + 0x26, 0x17, 0x65, 0xea, 0xa1, 0xc9, 0x94, 0x19, 0x2a, 0xb9, 0x72, 0xb1, 0xfb, 0x43, 0x78, 0x42, + 0x92, 0x5c, 0x1c, 0x25, 0x95, 0x05, 0xa9, 0xf1, 0xa5, 0x45, 0x39, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, + 0x9c, 0x41, 0xec, 0x20, 0x7e, 0x68, 0x51, 0x8e, 0x90, 0x3c, 0x17, 0x77, 0x72, 0x7e, 0x5e, 0x5a, + 0x66, 0x7a, 0x7c, 0x41, 0x62, 0x49, 0x86, 0x04, 0x13, 0x58, 0x96, 0x0b, 0x22, 0x14, 0x90, 0x58, + 0x92, 0x91, 0xc4, 0x06, 0xb6, 0xc4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xaf, 0x7b, 0x2c, + 0x97, 0x00, 0x00, 0x00, } 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") } |