From 5f753fe44e9d1ea278a55f9028cd0d3f093afe8a Mon Sep 17 00:00:00 2001 From: Maksim An Date: Thu, 28 Oct 2021 12:30:48 -0700 Subject: [PATCH 1/3] protos: Add global_container_annotations to runhcs options protos Signed-off-by: Maksim An --- .../options/runhcs.pb.go | 695 +++++++++++------- .../options/runhcs.proto | 3 + .../options/runhcs.pb.go | 695 +++++++++++------- .../options/runhcs.proto | 3 + 4 files changed, 862 insertions(+), 534 deletions(-) diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go index 89aff3723a..e9e438215e 100644 --- a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go +++ b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go @@ -6,10 +6,12 @@ package options import ( fmt "fmt" proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" + math_bits "math/bits" reflect "reflect" strings "strings" time "time" @@ -25,7 +27,7 @@ var _ = time.Kitchen // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Options_DebugType int32 @@ -143,10 +145,12 @@ type Options struct { // io_retry_timeout_in_sec is the timeout in seconds for how long to try and reconnect to an upstream IO provider if a connection is lost. // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite // timeout. - IoRetryTimeoutInSec int32 `protobuf:"varint,17,opt,name=io_retry_timeout_in_sec,json=ioRetryTimeoutInSec,proto3" json:"io_retry_timeout_in_sec,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + IoRetryTimeoutInSec int32 `protobuf:"varint,17,opt,name=io_retry_timeout_in_sec,json=ioRetryTimeoutInSec,proto3" json:"io_retry_timeout_in_sec,omitempty"` + // global_container_annotations specifies a set of annotations that should be set for every workload container + GlobalContainerAnnotations map[string]string `protobuf:"bytes,18,rep,name=global_container_annotations,json=globalContainerAnnotations,proto3" json:"global_container_annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Options) Reset() { *m = Options{} } @@ -162,7 +166,7 @@ func (m *Options) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Options.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -211,7 +215,7 @@ func (m *ProcessDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return xxx_messageInfo_ProcessDetails.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -234,6 +238,7 @@ func init() { proto.RegisterEnum("containerd.runhcs.v1.Options_DebugType", Options_DebugType_name, Options_DebugType_value) proto.RegisterEnum("containerd.runhcs.v1.Options_SandboxIsolation", Options_SandboxIsolation_name, Options_SandboxIsolation_value) proto.RegisterType((*Options)(nil), "containerd.runhcs.v1.Options") + proto.RegisterMapType((map[string]string)(nil), "containerd.runhcs.v1.Options.GlobalContainerAnnotationsEntry") proto.RegisterType((*ProcessDetails)(nil), "containerd.runhcs.v1.ProcessDetails") } @@ -242,73 +247,78 @@ func init() { } var fileDescriptor_b643df6839c75082 = []byte{ - // 953 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5d, 0x6f, 0xdb, 0x36, - 0x17, 0xb6, 0xda, 0x24, 0xb6, 0x4e, 0xbe, 0x1c, 0x36, 0x40, 0x85, 0xe4, 0xad, 0x6d, 0xa4, 0x2f, - 0xd0, 0x14, 0x6b, 0xa4, 0xa4, 0xdb, 0xdd, 0x06, 0x0c, 0x8d, 0xed, 0xb4, 0x1e, 0xf2, 0x61, 0xc8, - 0x59, 0xba, 0x8f, 0x0b, 0x42, 0x1f, 0x8c, 0x4c, 0x54, 0x12, 0x05, 0x92, 0xf6, 0xe2, 0x5e, 0xed, - 0x27, 0xec, 0x87, 0xec, 0x87, 0xe4, 0x72, 0x97, 0x03, 0x06, 0x64, 0xab, 0x7f, 0xc9, 0x40, 0x8a, - 0x4a, 0xbb, 0x20, 0xd8, 0xcd, 0xae, 0x4c, 0x3e, 0xcf, 0xc3, 0x87, 0xe7, 0x1c, 0x9d, 0x43, 0xc3, - 0x59, 0x42, 0xe5, 0x78, 0x12, 0xba, 0x11, 0xcb, 0xbc, 0x13, 0x1a, 0x71, 0x26, 0xd8, 0xa5, 0xf4, - 0xc6, 0x91, 0x10, 0x63, 0x9a, 0x79, 0x51, 0x16, 0x7b, 0x11, 0xcb, 0x65, 0x40, 0x73, 0xc2, 0xe3, - 0x3d, 0x85, 0xed, 0xf1, 0x49, 0x3e, 0x8e, 0xc4, 0xde, 0xf4, 0xc0, 0x63, 0x85, 0xa4, 0x2c, 0x17, - 0x5e, 0x89, 0xb8, 0x05, 0x67, 0x92, 0xa1, 0xcd, 0x8f, 0x7a, 0xd7, 0x10, 0xd3, 0x83, 0xad, 0xcd, - 0x84, 0x25, 0x4c, 0x0b, 0x3c, 0xb5, 0x2a, 0xb5, 0x5b, 0xed, 0x84, 0xb1, 0x24, 0x25, 0x9e, 0xde, - 0x85, 0x93, 0x4b, 0x4f, 0xd2, 0x8c, 0x08, 0x19, 0x64, 0x45, 0x29, 0xd8, 0xf9, 0xb5, 0x0e, 0xf5, - 0xb3, 0xf2, 0x16, 0xb4, 0x09, 0x8b, 0x31, 0x09, 0x27, 0x89, 0x63, 0x75, 0xac, 0xdd, 0x86, 0x5f, - 0x6e, 0xd0, 0x11, 0x80, 0x5e, 0x60, 0x39, 0x2b, 0x88, 0xf3, 0xa0, 0x63, 0xed, 0xae, 0xbd, 0x7c, - 0xe6, 0xde, 0x17, 0x83, 0x6b, 0x8c, 0xdc, 0x9e, 0xd2, 0x9f, 0xcf, 0x0a, 0xe2, 0xdb, 0x71, 0xb5, - 0x44, 0x4f, 0x61, 0x95, 0x93, 0x84, 0x0a, 0xc9, 0x67, 0x98, 0x33, 0x26, 0x9d, 0x87, 0x1d, 0x6b, - 0xd7, 0xf6, 0x57, 0x2a, 0xd0, 0x67, 0x4c, 0x2a, 0x91, 0x08, 0xf2, 0x38, 0x64, 0x57, 0x98, 0x66, - 0x41, 0x42, 0x9c, 0x85, 0x52, 0x64, 0xc0, 0x81, 0xc2, 0xd0, 0x73, 0x68, 0x56, 0xa2, 0x22, 0x0d, - 0xe4, 0x25, 0xe3, 0x99, 0xb3, 0xa8, 0x75, 0xeb, 0x06, 0x1f, 0x1a, 0x18, 0xfd, 0x08, 0x1b, 0xb7, - 0x7e, 0x82, 0xa5, 0x81, 0x8a, 0xcf, 0x59, 0xd2, 0x39, 0xb8, 0xff, 0x9e, 0xc3, 0xc8, 0xdc, 0x58, - 0x9d, 0xf2, 0xab, 0x3b, 0x6f, 0x11, 0xe4, 0xc1, 0x66, 0xc8, 0x98, 0xc4, 0x97, 0x34, 0x25, 0x42, - 0xe7, 0x84, 0x8b, 0x40, 0x8e, 0x9d, 0xba, 0x8e, 0x65, 0x43, 0x71, 0x47, 0x8a, 0x52, 0x99, 0x0d, - 0x03, 0x39, 0x46, 0x2f, 0x00, 0x4d, 0x33, 0x5c, 0x70, 0x16, 0x11, 0x21, 0x18, 0xc7, 0x11, 0x9b, - 0xe4, 0xd2, 0x69, 0x74, 0xac, 0xdd, 0x45, 0xbf, 0x39, 0xcd, 0x86, 0x15, 0xd1, 0x55, 0x38, 0x72, - 0x61, 0x73, 0x9a, 0xe1, 0x8c, 0x64, 0x8c, 0xcf, 0xb0, 0xa0, 0xef, 0x09, 0xa6, 0x39, 0xce, 0x42, - 0xc7, 0xae, 0xf4, 0x27, 0x9a, 0x1a, 0xd1, 0xf7, 0x64, 0x90, 0x9f, 0x84, 0xa8, 0x05, 0xf0, 0x7a, - 0xf8, 0xed, 0xc5, 0x9b, 0x9e, 0xba, 0xcb, 0x01, 0x1d, 0xc4, 0x27, 0x08, 0xfa, 0x0a, 0xb6, 0x45, - 0x14, 0xa4, 0x04, 0x47, 0xc5, 0x04, 0xa7, 0x34, 0xa3, 0x52, 0x60, 0xc9, 0xb0, 0x49, 0xcb, 0x59, - 0xd6, 0x1f, 0xfd, 0xb1, 0x96, 0x74, 0x8b, 0xc9, 0xb1, 0x16, 0x9c, 0x33, 0x53, 0x07, 0x74, 0x02, - 0xff, 0x8f, 0xc9, 0x65, 0x30, 0x49, 0x25, 0xbe, 0xad, 0x1b, 0x16, 0x11, 0x0f, 0x64, 0x34, 0xbe, - 0x8d, 0x2e, 0x09, 0x9d, 0x15, 0x1d, 0x5d, 0xdb, 0x68, 0xbb, 0x95, 0x74, 0x54, 0x2a, 0xcb, 0x60, - 0x5f, 0x87, 0xe8, 0x6b, 0x78, 0x52, 0xd9, 0x4d, 0xb3, 0xfb, 0x7c, 0x56, 0xb5, 0x8f, 0x63, 0x44, - 0x17, 0xd9, 0x5d, 0x03, 0xd5, 0x29, 0xe3, 0x80, 0x93, 0xea, 0xac, 0xb3, 0xa6, 0xe3, 0x5f, 0xd1, - 0xa0, 0x11, 0xa3, 0x0e, 0x2c, 0x9f, 0x76, 0x87, 0x9c, 0x5d, 0xcd, 0x5e, 0xc5, 0x31, 0x77, 0xd6, - 0x75, 0x4d, 0x3e, 0x85, 0xd0, 0x36, 0xd8, 0x29, 0x4b, 0x70, 0x4a, 0xa6, 0x24, 0x75, 0x9a, 0x9a, - 0x6f, 0xa4, 0x2c, 0x39, 0x56, 0x7b, 0xf4, 0x05, 0x3c, 0xa6, 0x0c, 0x73, 0xa2, 0x5a, 0x56, 0x0d, - 0x0e, 0x9b, 0x48, 0x15, 0x9d, 0x20, 0x91, 0xb3, 0xa1, 0xc3, 0x7b, 0x44, 0x99, 0xaf, 0xd8, 0xf3, - 0x92, 0x1c, 0xe4, 0x23, 0x12, 0xed, 0x3c, 0x07, 0xfb, 0x76, 0x00, 0x90, 0x0d, 0x8b, 0xa7, 0xc3, - 0xc1, 0xb0, 0xdf, 0xac, 0xa1, 0x06, 0x2c, 0x1c, 0x0d, 0x8e, 0xfb, 0x4d, 0x0b, 0xd5, 0xe1, 0x61, - 0xff, 0xfc, 0x6d, 0xf3, 0xc1, 0x8e, 0x07, 0xcd, 0xbb, 0x7d, 0x86, 0x96, 0xa1, 0x3e, 0xf4, 0xcf, - 0xba, 0xfd, 0xd1, 0xa8, 0x59, 0x43, 0x6b, 0x00, 0x6f, 0xbe, 0x1f, 0xf6, 0xfd, 0x8b, 0xc1, 0xe8, - 0xcc, 0x6f, 0x5a, 0x3b, 0x7f, 0x3c, 0x84, 0x35, 0xd3, 0x26, 0x3d, 0x22, 0x03, 0x9a, 0x0a, 0xf4, - 0x04, 0x40, 0x8f, 0x0a, 0xce, 0x83, 0x8c, 0xe8, 0xd1, 0xb5, 0x7d, 0x5b, 0x23, 0xa7, 0x41, 0x46, - 0x50, 0x17, 0x20, 0xe2, 0x24, 0x90, 0x24, 0xc6, 0x81, 0xd4, 0xe3, 0xbb, 0xfc, 0x72, 0xcb, 0x2d, - 0x9f, 0x05, 0xb7, 0x7a, 0x16, 0xdc, 0xf3, 0xea, 0x59, 0x38, 0x6c, 0x5c, 0xdf, 0xb4, 0x6b, 0xbf, - 0xfc, 0xd9, 0xb6, 0x7c, 0xdb, 0x9c, 0x7b, 0x25, 0xd1, 0x67, 0x80, 0xde, 0x11, 0x9e, 0x93, 0x54, - 0x97, 0x01, 0x1f, 0xec, 0xef, 0xe3, 0x5c, 0xe8, 0x01, 0x5e, 0xf0, 0xd7, 0x4b, 0x46, 0x39, 0x1c, - 0xec, 0xef, 0x9f, 0x0a, 0xe4, 0xc2, 0x23, 0xd3, 0xb4, 0x11, 0xcb, 0x32, 0x2a, 0x71, 0x38, 0x93, - 0x44, 0xe8, 0x49, 0x5e, 0xf0, 0x37, 0x4a, 0xaa, 0xab, 0x99, 0x43, 0x45, 0xa0, 0x23, 0xe8, 0x18, - 0xfd, 0x4f, 0x8c, 0xbf, 0xa3, 0x79, 0x82, 0x05, 0x91, 0xb8, 0xe0, 0x74, 0x1a, 0x48, 0x62, 0x0e, - 0x2f, 0xea, 0xc3, 0xff, 0x2b, 0x75, 0x6f, 0x4b, 0xd9, 0x88, 0xc8, 0x61, 0x29, 0x2a, 0x7d, 0x7a, - 0xd0, 0xbe, 0xc7, 0x47, 0xf7, 0x43, 0x6c, 0x6c, 0x96, 0xb4, 0xcd, 0xf6, 0x5d, 0x9b, 0x91, 0xd6, - 0x94, 0x2e, 0x2f, 0x00, 0xcc, 0x80, 0x62, 0x1a, 0xeb, 0x51, 0x5e, 0x3d, 0x5c, 0x9d, 0xdf, 0xb4, - 0x6d, 0x53, 0xf6, 0x41, 0xcf, 0xb7, 0x8d, 0x60, 0x10, 0xa3, 0x67, 0xd0, 0x9c, 0x08, 0xc2, 0xff, - 0x51, 0x96, 0x86, 0xbe, 0x64, 0x55, 0xe1, 0x1f, 0x8b, 0xf2, 0x14, 0xea, 0xe4, 0x8a, 0x44, 0xca, - 0x53, 0xcd, 0xaf, 0x7d, 0x08, 0xf3, 0x9b, 0xf6, 0x52, 0xff, 0x8a, 0x44, 0x83, 0x9e, 0xbf, 0xa4, - 0xa8, 0x41, 0x7c, 0x18, 0x5f, 0x7f, 0x68, 0xd5, 0x7e, 0xff, 0xd0, 0xaa, 0xfd, 0x3c, 0x6f, 0x59, - 0xd7, 0xf3, 0x96, 0xf5, 0xdb, 0xbc, 0x65, 0xfd, 0x35, 0x6f, 0x59, 0x3f, 0x7c, 0xf3, 0xdf, 0xff, - 0x44, 0xbe, 0x34, 0xbf, 0xdf, 0xd5, 0xc2, 0x25, 0xfd, 0xdd, 0x3f, 0xff, 0x3b, 0x00, 0x00, 0xff, - 0xff, 0x6b, 0x83, 0xa6, 0x5f, 0x9b, 0x06, 0x00, 0x00, + // 1028 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xe3, 0x36, + 0x17, 0xb5, 0xf2, 0xb4, 0x6e, 0x5e, 0x0e, 0x27, 0xc0, 0x08, 0xc9, 0x8c, 0x6d, 0x64, 0x3e, 0x60, + 0x32, 0xf8, 0x26, 0x52, 0x92, 0x76, 0x51, 0xf4, 0x81, 0x22, 0xb1, 0x9d, 0x8c, 0x8b, 0x3c, 0x0c, + 0x39, 0xcd, 0xf4, 0xb1, 0x20, 0xf4, 0x60, 0x64, 0x21, 0x92, 0x28, 0x88, 0x94, 0x1b, 0xcf, 0xa6, + 0xfd, 0x09, 0xfd, 0x59, 0x59, 0x76, 0x59, 0xa0, 0x40, 0xda, 0xf1, 0xef, 0xe8, 0xa2, 0x20, 0x45, + 0x39, 0x69, 0x90, 0x4e, 0x17, 0x5d, 0x99, 0x3c, 0xe7, 0xdc, 0xc3, 0xcb, 0x2b, 0xde, 0x6b, 0x38, + 0x0b, 0x42, 0x3e, 0xc8, 0x5d, 0xd3, 0xa3, 0xb1, 0x75, 0x12, 0x7a, 0x19, 0x65, 0xf4, 0x92, 0x5b, + 0x03, 0x8f, 0xb1, 0x41, 0x18, 0x5b, 0x5e, 0xec, 0x5b, 0x1e, 0x4d, 0xb8, 0x13, 0x26, 0x24, 0xf3, + 0xb7, 0x05, 0xb6, 0x9d, 0xe5, 0xc9, 0xc0, 0x63, 0xdb, 0xc3, 0x5d, 0x8b, 0xa6, 0x3c, 0xa4, 0x09, + 0xb3, 0x0a, 0xc4, 0x4c, 0x33, 0xca, 0x29, 0x5a, 0xbb, 0xd3, 0x9b, 0x8a, 0x18, 0xee, 0xae, 0xaf, + 0x05, 0x34, 0xa0, 0x52, 0x60, 0x89, 0x55, 0xa1, 0x5d, 0x6f, 0x04, 0x94, 0x06, 0x11, 0xb1, 0xe4, + 0xce, 0xcd, 0x2f, 0x2d, 0x1e, 0xc6, 0x84, 0x71, 0x27, 0x4e, 0x0b, 0xc1, 0xe6, 0x9f, 0x55, 0x98, + 0x3f, 0x2b, 0x4e, 0x41, 0x6b, 0x30, 0xeb, 0x13, 0x37, 0x0f, 0x0c, 0xad, 0xa9, 0x6d, 0x55, 0xed, + 0x62, 0x83, 0x0e, 0x01, 0xe4, 0x02, 0xf3, 0x51, 0x4a, 0x8c, 0xa9, 0xa6, 0xb6, 0xb5, 0xbc, 0xf7, + 0xd2, 0x7c, 0x2c, 0x07, 0x53, 0x19, 0x99, 0x6d, 0xa1, 0x3f, 0x1f, 0xa5, 0xc4, 0xd6, 0xfd, 0x72, + 0x89, 0x5e, 0xc0, 0x52, 0x46, 0x82, 0x90, 0xf1, 0x6c, 0x84, 0x33, 0x4a, 0xb9, 0x31, 0xdd, 0xd4, + 0xb6, 0x74, 0x7b, 0xb1, 0x04, 0x6d, 0x4a, 0xb9, 0x10, 0x31, 0x27, 0xf1, 0x5d, 0x7a, 0x8d, 0xc3, + 0xd8, 0x09, 0x88, 0x31, 0x53, 0x88, 0x14, 0xd8, 0x15, 0x18, 0x7a, 0x05, 0xb5, 0x52, 0x94, 0x46, + 0x0e, 0xbf, 0xa4, 0x59, 0x6c, 0xcc, 0x4a, 0xdd, 0x8a, 0xc2, 0x7b, 0x0a, 0x46, 0xdf, 0xc3, 0xea, + 0xc4, 0x8f, 0xd1, 0xc8, 0x11, 0xf9, 0x19, 0x73, 0xf2, 0x0e, 0xe6, 0x87, 0xef, 0xd0, 0x57, 0x27, + 0x96, 0x51, 0x76, 0x79, 0xe6, 0x04, 0x41, 0x16, 0xac, 0xb9, 0x94, 0x72, 0x7c, 0x19, 0x46, 0x84, + 0xc9, 0x3b, 0xe1, 0xd4, 0xe1, 0x03, 0x63, 0x5e, 0xe6, 0xb2, 0x2a, 0xb8, 0x43, 0x41, 0x89, 0x9b, + 0xf5, 0x1c, 0x3e, 0x40, 0xaf, 0x01, 0x0d, 0x63, 0x9c, 0x66, 0xd4, 0x23, 0x8c, 0xd1, 0x0c, 0x7b, + 0x34, 0x4f, 0xb8, 0x51, 0x6d, 0x6a, 0x5b, 0xb3, 0x76, 0x6d, 0x18, 0xf7, 0x4a, 0xa2, 0x25, 0x70, + 0x64, 0xc2, 0xda, 0x30, 0xc6, 0x31, 0x89, 0x69, 0x36, 0xc2, 0x2c, 0x7c, 0x47, 0x70, 0x98, 0xe0, + 0xd8, 0x35, 0xf4, 0x52, 0x7f, 0x22, 0xa9, 0x7e, 0xf8, 0x8e, 0x74, 0x93, 0x13, 0x17, 0xd5, 0x01, + 0x8e, 0x7a, 0x5f, 0x5f, 0xbc, 0x69, 0x8b, 0xb3, 0x0c, 0x90, 0x49, 0xdc, 0x43, 0xd0, 0xe7, 0xb0, + 0xc1, 0x3c, 0x27, 0x22, 0xd8, 0x4b, 0x73, 0x1c, 0x85, 0x71, 0xc8, 0x19, 0xe6, 0x14, 0xab, 0x6b, + 0x19, 0x0b, 0xf2, 0xa3, 0x3f, 0x95, 0x92, 0x56, 0x9a, 0x1f, 0x4b, 0xc1, 0x39, 0x55, 0x75, 0x40, + 0x27, 0xf0, 0x3f, 0x9f, 0x5c, 0x3a, 0x79, 0xc4, 0xf1, 0xa4, 0x6e, 0x98, 0x79, 0x99, 0xc3, 0xbd, + 0xc1, 0x24, 0xbb, 0xc0, 0x35, 0x16, 0x65, 0x76, 0x0d, 0xa5, 0x6d, 0x95, 0xd2, 0x7e, 0xa1, 0x2c, + 0x92, 0x3d, 0x72, 0xd1, 0x97, 0xf0, 0xbc, 0xb4, 0x1b, 0xc6, 0x8f, 0xf9, 0x2c, 0x49, 0x1f, 0x43, + 0x89, 0x2e, 0xe2, 0x87, 0x06, 0xe2, 0xa5, 0x0c, 0x9c, 0x8c, 0x94, 0xb1, 0xc6, 0xb2, 0xcc, 0x7f, + 0x51, 0x82, 0x4a, 0x8c, 0x9a, 0xb0, 0x70, 0xda, 0xea, 0x65, 0xf4, 0x7a, 0xb4, 0xef, 0xfb, 0x99, + 0xb1, 0x22, 0x6b, 0x72, 0x1f, 0x42, 0x1b, 0xa0, 0x47, 0x34, 0xc0, 0x11, 0x19, 0x92, 0xc8, 0xa8, + 0x49, 0xbe, 0x1a, 0xd1, 0xe0, 0x58, 0xec, 0xd1, 0xc7, 0xf0, 0x34, 0xa4, 0x38, 0x23, 0xe2, 0xc9, + 0x8a, 0xc6, 0xa1, 0x39, 0x17, 0xd9, 0x31, 0xe2, 0x19, 0xab, 0x32, 0xbd, 0x27, 0x21, 0xb5, 0x05, + 0x7b, 0x5e, 0x90, 0xdd, 0xa4, 0x4f, 0x3c, 0xf4, 0x23, 0x3c, 0x0b, 0x22, 0xea, 0x3a, 0xd1, 0xbd, + 0x42, 0x39, 0x49, 0x42, 0xb9, 0x7c, 0x35, 0xcc, 0x40, 0xcd, 0xe9, 0xad, 0x85, 0xbd, 0x2f, 0x3e, + 0xfc, 0xfc, 0x8e, 0xa4, 0xc3, 0xa4, 0x7c, 0xfb, 0x77, 0xf1, 0x9d, 0x44, 0x34, 0xcb, 0x7a, 0xf0, + 0x8f, 0x82, 0xf5, 0x13, 0x68, 0xfc, 0x4b, 0x38, 0xaa, 0xc1, 0xf4, 0x15, 0x19, 0xc9, 0x46, 0xd7, + 0x6d, 0xb1, 0x14, 0xcd, 0x3f, 0x74, 0xa2, 0xbc, 0xe8, 0x70, 0xdd, 0x2e, 0x36, 0x9f, 0x4e, 0x7d, + 0xa2, 0x6d, 0xbe, 0x02, 0x7d, 0xd2, 0xd0, 0x48, 0x87, 0xd9, 0xd3, 0x5e, 0xb7, 0xd7, 0xa9, 0x55, + 0x50, 0x15, 0x66, 0x0e, 0xbb, 0xc7, 0x9d, 0x9a, 0x86, 0xe6, 0x61, 0xba, 0x73, 0xfe, 0xb6, 0x36, + 0xb5, 0x69, 0x41, 0xed, 0x61, 0xdf, 0xa0, 0x05, 0x98, 0xef, 0xd9, 0x67, 0xad, 0x4e, 0xbf, 0x5f, + 0xab, 0xa0, 0x65, 0x80, 0x37, 0xdf, 0xf6, 0x3a, 0xf6, 0x45, 0xb7, 0x7f, 0x66, 0xd7, 0xb4, 0xcd, + 0xdf, 0xa6, 0x61, 0x59, 0x3d, 0xfb, 0x36, 0xe1, 0x4e, 0x18, 0x31, 0xf4, 0x1c, 0x40, 0xb6, 0x3e, + 0x4e, 0x9c, 0x98, 0xa8, 0x0c, 0x75, 0x89, 0x9c, 0x3a, 0x31, 0x41, 0x2d, 0x00, 0x2f, 0x23, 0x0e, + 0x27, 0x3e, 0x76, 0xb8, 0x4c, 0x76, 0x61, 0x6f, 0xdd, 0x2c, 0xc6, 0x9c, 0x59, 0x8e, 0x39, 0xf3, + 0xbc, 0x1c, 0x73, 0x07, 0xd5, 0x9b, 0xdb, 0x46, 0xe5, 0xe7, 0xdf, 0x1b, 0x9a, 0xad, 0xab, 0xb8, + 0x7d, 0x8e, 0xfe, 0x0f, 0xe8, 0x8a, 0x64, 0x09, 0x89, 0xe4, 0x67, 0xc5, 0xbb, 0x3b, 0x3b, 0x38, + 0x61, 0x72, 0x20, 0xcd, 0xd8, 0x2b, 0x05, 0x23, 0x1c, 0x76, 0x77, 0x76, 0x4e, 0x19, 0x32, 0xe1, + 0x89, 0x6a, 0x42, 0x8f, 0xc6, 0x71, 0xc8, 0xb1, 0x3b, 0xe2, 0x84, 0xc9, 0xc9, 0x34, 0x63, 0xaf, + 0x16, 0x54, 0x4b, 0x32, 0x07, 0x82, 0x40, 0x87, 0xd0, 0x54, 0xfa, 0x1f, 0x68, 0x76, 0x15, 0x26, + 0x01, 0x66, 0x84, 0xe3, 0x34, 0x0b, 0x87, 0x0e, 0x27, 0x2a, 0x78, 0x56, 0x06, 0x3f, 0x2b, 0x74, + 0x6f, 0x0b, 0x59, 0x9f, 0xf0, 0x5e, 0x21, 0x2a, 0x7c, 0xda, 0xd0, 0x78, 0xc4, 0x47, 0xbe, 0x6f, + 0x5f, 0xd9, 0xcc, 0x49, 0x9b, 0x8d, 0x87, 0x36, 0x7d, 0xa9, 0x29, 0x5c, 0x5e, 0x03, 0xa8, 0x81, + 0x83, 0x43, 0x5f, 0x8e, 0xa6, 0xa5, 0x83, 0xa5, 0xf1, 0x6d, 0x43, 0x57, 0x65, 0xef, 0xb6, 0x6d, + 0x5d, 0x09, 0xba, 0x3e, 0x7a, 0x09, 0xb5, 0x9c, 0x91, 0xec, 0x6f, 0x65, 0xa9, 0xca, 0x43, 0x96, + 0x04, 0x7e, 0x57, 0x94, 0x17, 0x30, 0x4f, 0xae, 0x89, 0x27, 0x3c, 0xc5, 0x3c, 0xd2, 0x0f, 0x60, + 0x7c, 0xdb, 0x98, 0xeb, 0x5c, 0x13, 0xaf, 0xdb, 0xb6, 0xe7, 0x04, 0xd5, 0xf5, 0x0f, 0xfc, 0x9b, + 0xf7, 0xf5, 0xca, 0xaf, 0xef, 0xeb, 0x95, 0x9f, 0xc6, 0x75, 0xed, 0x66, 0x5c, 0xd7, 0x7e, 0x19, + 0xd7, 0xb5, 0x3f, 0xc6, 0x75, 0xed, 0xbb, 0xaf, 0xfe, 0xfb, 0x9f, 0xe2, 0x67, 0xea, 0xf7, 0x9b, + 0x8a, 0x3b, 0x27, 0xbf, 0xfb, 0x47, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xf3, 0xdd, 0xed, + 0x6b, 0x07, 0x00, 0x00, } func (m *Options) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -316,131 +326,165 @@ func (m *Options) Marshal() (dAtA []byte, err error) { } func (m *Options) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Options) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Debug { - dAtA[i] = 0x8 - i++ - if m.Debug { + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.GlobalContainerAnnotations) > 0 { + for k := range m.GlobalContainerAnnotations { + v := m.GlobalContainerAnnotations[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintRunhcs(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintRunhcs(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintRunhcs(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + } + if m.IoRetryTimeoutInSec != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.IoRetryTimeoutInSec)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x88 + } + if len(m.LogLevel) > 0 { + i -= len(m.LogLevel) + copy(dAtA[i:], m.LogLevel) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.NCProxyAddr) > 0 { + i -= len(m.NCProxyAddr) + copy(dAtA[i:], m.NCProxyAddr) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr))) + i-- + dAtA[i] = 0x7a + } + if m.ShareScratch { + i-- + if m.ShareScratch { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - } - if m.DebugType != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType)) + i-- + dAtA[i] = 0x70 } - if len(m.RegistryRoot) > 0 { - dAtA[i] = 0x1a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot))) - i += copy(dAtA[i:], m.RegistryRoot) + if m.DefaultVmScratchSizeInGb != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb)) + i-- + dAtA[i] = 0x68 } - if len(m.SandboxImage) > 0 { - dAtA[i] = 0x22 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage))) - i += copy(dAtA[i:], m.SandboxImage) + if m.DefaultContainerScratchSizeInGb != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb)) + i-- + dAtA[i] = 0x60 } - if len(m.SandboxPlatform) > 0 { - dAtA[i] = 0x2a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform))) - i += copy(dAtA[i:], m.SandboxPlatform) + if m.ScaleCpuLimitsToSandbox { + i-- + if m.ScaleCpuLimitsToSandbox { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x58 } - if m.SandboxIsolation != 0 { - dAtA[i] = 0x30 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation)) + if len(m.GPUVHDPath) > 0 { + i -= len(m.GPUVHDPath) + copy(dAtA[i:], m.GPUVHDPath) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath))) + i-- + dAtA[i] = 0x52 } - if len(m.BootFilesRootPath) > 0 { - dAtA[i] = 0x3a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath))) - i += copy(dAtA[i:], m.BootFilesRootPath) + if m.VmMemorySizeInMb != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb)) + i-- + dAtA[i] = 0x48 } if m.VmProcessorCount != 0 { - dAtA[i] = 0x40 - i++ i = encodeVarintRunhcs(dAtA, i, uint64(m.VmProcessorCount)) + i-- + dAtA[i] = 0x40 } - if m.VmMemorySizeInMb != 0 { - dAtA[i] = 0x48 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb)) + if len(m.BootFilesRootPath) > 0 { + i -= len(m.BootFilesRootPath) + copy(dAtA[i:], m.BootFilesRootPath) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath))) + i-- + dAtA[i] = 0x3a } - if len(m.GPUVHDPath) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath))) - i += copy(dAtA[i:], m.GPUVHDPath) + if m.SandboxIsolation != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation)) + i-- + dAtA[i] = 0x30 } - if m.ScaleCpuLimitsToSandbox { - dAtA[i] = 0x58 - i++ - if m.ScaleCpuLimitsToSandbox { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.SandboxPlatform) > 0 { + i -= len(m.SandboxPlatform) + copy(dAtA[i:], m.SandboxPlatform) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform))) + i-- + dAtA[i] = 0x2a } - if m.DefaultContainerScratchSizeInGb != 0 { - dAtA[i] = 0x60 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb)) + if len(m.SandboxImage) > 0 { + i -= len(m.SandboxImage) + copy(dAtA[i:], m.SandboxImage) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage))) + i-- + dAtA[i] = 0x22 } - if m.DefaultVmScratchSizeInGb != 0 { - dAtA[i] = 0x68 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb)) + if len(m.RegistryRoot) > 0 { + i -= len(m.RegistryRoot) + copy(dAtA[i:], m.RegistryRoot) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot))) + i-- + dAtA[i] = 0x1a } - if m.ShareScratch { - dAtA[i] = 0x70 - i++ - if m.ShareScratch { + if m.DebugType != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType)) + i-- + dAtA[i] = 0x10 + } + if m.Debug { + i-- + if m.Debug { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - } - if len(m.NCProxyAddr) > 0 { - dAtA[i] = 0x7a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr))) - i += copy(dAtA[i:], m.NCProxyAddr) - } - if len(m.LogLevel) > 0 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel))) - i += copy(dAtA[i:], m.LogLevel) - } - if m.IoRetryTimeoutInSec != 0 { - dAtA[i] = 0x88 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.IoRetryTimeoutInSec)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *ProcessDetails) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -448,74 +492,84 @@ func (m *ProcessDetails) Marshal() (dAtA []byte, err error) { } func (m *ProcessDetails) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ProcessDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.ImageName) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName))) - i += copy(dAtA[i:], m.ImageName) - } - dAtA[i] = 0x12 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt))) - n1, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i:]) - if err != nil { - return 0, err + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n1 - if m.KernelTime_100Ns != 0 { - dAtA[i] = 0x18 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns)) + if len(m.ExecID) > 0 { + i -= len(m.ExecID) + copy(dAtA[i:], m.ExecID) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID))) + i-- + dAtA[i] = 0x4a } - if m.MemoryCommitBytes != 0 { - dAtA[i] = 0x20 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes)) + if m.UserTime_100Ns != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns)) + i-- + dAtA[i] = 0x40 } - if m.MemoryWorkingSetPrivateBytes != 0 { - dAtA[i] = 0x28 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes)) + if m.ProcessID != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID)) + i-- + dAtA[i] = 0x38 } if m.MemoryWorkingSetSharedBytes != 0 { - dAtA[i] = 0x30 - i++ i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetSharedBytes)) + i-- + dAtA[i] = 0x30 } - if m.ProcessID != 0 { - dAtA[i] = 0x38 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID)) + if m.MemoryWorkingSetPrivateBytes != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes)) + i-- + dAtA[i] = 0x28 } - if m.UserTime_100Ns != 0 { - dAtA[i] = 0x40 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns)) + if m.MemoryCommitBytes != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes)) + i-- + dAtA[i] = 0x20 } - if len(m.ExecID) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID))) - i += copy(dAtA[i:], m.ExecID) + if m.KernelTime_100Ns != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):]) + if err1 != nil { + return 0, err1 } - return i, nil + i -= n1 + i = encodeVarintRunhcs(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x12 + if len(m.ImageName) > 0 { + i -= len(m.ImageName) + copy(dAtA[i:], m.ImageName) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func encodeVarintRunhcs(dAtA []byte, offset int, v uint64) int { + offset -= sovRunhcs(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Options) Size() (n int) { if m == nil { @@ -581,6 +635,14 @@ func (m *Options) Size() (n int) { if m.IoRetryTimeoutInSec != 0 { n += 2 + sovRunhcs(uint64(m.IoRetryTimeoutInSec)) } + if len(m.GlobalContainerAnnotations) > 0 { + for k, v := range m.GlobalContainerAnnotations { + _ = k + _ = v + mapEntrySize := 1 + len(k) + sovRunhcs(uint64(len(k))) + 1 + len(v) + sovRunhcs(uint64(len(v))) + n += mapEntrySize + 2 + sovRunhcs(uint64(mapEntrySize)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -628,14 +690,7 @@ func (m *ProcessDetails) Size() (n int) { } func sovRunhcs(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n + return (math_bits.Len64(x|1) + 6) / 7 } func sozRunhcs(x uint64) (n int) { return sovRunhcs(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -644,6 +699,16 @@ func (this *Options) String() string { if this == nil { return "nil" } + keysForGlobalContainerAnnotations := make([]string, 0, len(this.GlobalContainerAnnotations)) + for k, _ := range this.GlobalContainerAnnotations { + keysForGlobalContainerAnnotations = append(keysForGlobalContainerAnnotations, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForGlobalContainerAnnotations) + mapStringForGlobalContainerAnnotations := "map[string]string{" + for _, k := range keysForGlobalContainerAnnotations { + mapStringForGlobalContainerAnnotations += fmt.Sprintf("%v: %v,", k, this.GlobalContainerAnnotations[k]) + } + mapStringForGlobalContainerAnnotations += "}" s := strings.Join([]string{`&Options{`, `Debug:` + fmt.Sprintf("%v", this.Debug) + `,`, `DebugType:` + fmt.Sprintf("%v", this.DebugType) + `,`, @@ -662,6 +727,7 @@ func (this *Options) String() string { `NCProxyAddr:` + fmt.Sprintf("%v", this.NCProxyAddr) + `,`, `LogLevel:` + fmt.Sprintf("%v", this.LogLevel) + `,`, `IoRetryTimeoutInSec:` + fmt.Sprintf("%v", this.IoRetryTimeoutInSec) + `,`, + `GlobalContainerAnnotations:` + mapStringForGlobalContainerAnnotations + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -673,7 +739,7 @@ func (this *ProcessDetails) String() string { } s := strings.Join([]string{`&ProcessDetails{`, `ImageName:` + fmt.Sprintf("%v", this.ImageName) + `,`, - `CreatedAt:` + strings.Replace(strings.Replace(this.CreatedAt.String(), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`, + `CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`, `KernelTime_100Ns:` + fmt.Sprintf("%v", this.KernelTime_100Ns) + `,`, `MemoryCommitBytes:` + fmt.Sprintf("%v", this.MemoryCommitBytes) + `,`, `MemoryWorkingSetPrivateBytes:` + fmt.Sprintf("%v", this.MemoryWorkingSetPrivateBytes) + `,`, @@ -1140,16 +1206,140 @@ func (m *Options) Unmarshal(dAtA []byte) error { break } } + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GlobalContainerAnnotations", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRunhcs + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRunhcs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.GlobalContainerAnnotations == nil { + m.GlobalContainerAnnotations = make(map[string]string) + } + var mapkey string + var mapvalue string + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthRunhcs + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthRunhcs + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var stringLenmapvalue uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapvalue |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapvalue := int(stringLenmapvalue) + if intStringLenmapvalue < 0 { + return ErrInvalidLengthRunhcs + } + postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthRunhcs + } + if postStringIndexmapvalue > l { + return io.ErrUnexpectedEOF + } + mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) + iNdEx = postStringIndexmapvalue + } else { + iNdEx = entryPreIndex + skippy, err := skipRunhcs(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthRunhcs + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.GlobalContainerAnnotations[mapkey] = mapvalue + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRunhcs(dAtA[iNdEx:]) if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthRunhcs - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthRunhcs } if (iNdEx + skippy) > l { @@ -1411,10 +1601,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthRunhcs - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthRunhcs } if (iNdEx + skippy) > l { @@ -1433,6 +1620,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { func skipRunhcs(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1464,10 +1652,8 @@ func skipRunhcs(dAtA []byte) (n int, err error) { break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1488,55 +1674,30 @@ func skipRunhcs(dAtA []byte) (n int, err error) { return 0, ErrInvalidLengthRunhcs } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthRunhcs - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowRunhcs - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipRunhcs(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthRunhcs - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupRunhcs + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthRunhcs + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthRunhcs = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowRunhcs = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthRunhcs = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowRunhcs = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupRunhcs = fmt.Errorf("proto: unexpected end of group") ) diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.proto b/cmd/containerd-shim-runhcs-v1/options/runhcs.proto index 60c89adbde..c193e2256c 100644 --- a/cmd/containerd-shim-runhcs-v1/options/runhcs.proto +++ b/cmd/containerd-shim-runhcs-v1/options/runhcs.proto @@ -98,6 +98,9 @@ message Options { // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite // timeout. int32 io_retry_timeout_in_sec = 17; + + // global_container_annotations specifies a set of annotations that should be set for every workload container + map global_container_annotations = 18; } // ProcessDetails contains additional information about a process. This is the additional diff --git a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go index 89aff3723a..e9e438215e 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go +++ b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go @@ -6,10 +6,12 @@ package options import ( fmt "fmt" proto "github.com/gogo/protobuf/proto" + github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" io "io" math "math" + math_bits "math/bits" reflect "reflect" strings "strings" time "time" @@ -25,7 +27,7 @@ var _ = time.Kitchen // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Options_DebugType int32 @@ -143,10 +145,12 @@ type Options struct { // io_retry_timeout_in_sec is the timeout in seconds for how long to try and reconnect to an upstream IO provider if a connection is lost. // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite // timeout. - IoRetryTimeoutInSec int32 `protobuf:"varint,17,opt,name=io_retry_timeout_in_sec,json=ioRetryTimeoutInSec,proto3" json:"io_retry_timeout_in_sec,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + IoRetryTimeoutInSec int32 `protobuf:"varint,17,opt,name=io_retry_timeout_in_sec,json=ioRetryTimeoutInSec,proto3" json:"io_retry_timeout_in_sec,omitempty"` + // global_container_annotations specifies a set of annotations that should be set for every workload container + GlobalContainerAnnotations map[string]string `protobuf:"bytes,18,rep,name=global_container_annotations,json=globalContainerAnnotations,proto3" json:"global_container_annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Options) Reset() { *m = Options{} } @@ -162,7 +166,7 @@ func (m *Options) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Options.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -211,7 +215,7 @@ func (m *ProcessDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro return xxx_messageInfo_ProcessDetails.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -234,6 +238,7 @@ func init() { proto.RegisterEnum("containerd.runhcs.v1.Options_DebugType", Options_DebugType_name, Options_DebugType_value) proto.RegisterEnum("containerd.runhcs.v1.Options_SandboxIsolation", Options_SandboxIsolation_name, Options_SandboxIsolation_value) proto.RegisterType((*Options)(nil), "containerd.runhcs.v1.Options") + proto.RegisterMapType((map[string]string)(nil), "containerd.runhcs.v1.Options.GlobalContainerAnnotationsEntry") proto.RegisterType((*ProcessDetails)(nil), "containerd.runhcs.v1.ProcessDetails") } @@ -242,73 +247,78 @@ func init() { } var fileDescriptor_b643df6839c75082 = []byte{ - // 953 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5d, 0x6f, 0xdb, 0x36, - 0x17, 0xb6, 0xda, 0x24, 0xb6, 0x4e, 0xbe, 0x1c, 0x36, 0x40, 0x85, 0xe4, 0xad, 0x6d, 0xa4, 0x2f, - 0xd0, 0x14, 0x6b, 0xa4, 0xa4, 0xdb, 0xdd, 0x06, 0x0c, 0x8d, 0xed, 0xb4, 0x1e, 0xf2, 0x61, 0xc8, - 0x59, 0xba, 0x8f, 0x0b, 0x42, 0x1f, 0x8c, 0x4c, 0x54, 0x12, 0x05, 0x92, 0xf6, 0xe2, 0x5e, 0xed, - 0x27, 0xec, 0x87, 0xec, 0x87, 0xe4, 0x72, 0x97, 0x03, 0x06, 0x64, 0xab, 0x7f, 0xc9, 0x40, 0x8a, - 0x4a, 0xbb, 0x20, 0xd8, 0xcd, 0xae, 0x4c, 0x3e, 0xcf, 0xc3, 0x87, 0xe7, 0x1c, 0x9d, 0x43, 0xc3, - 0x59, 0x42, 0xe5, 0x78, 0x12, 0xba, 0x11, 0xcb, 0xbc, 0x13, 0x1a, 0x71, 0x26, 0xd8, 0xa5, 0xf4, - 0xc6, 0x91, 0x10, 0x63, 0x9a, 0x79, 0x51, 0x16, 0x7b, 0x11, 0xcb, 0x65, 0x40, 0x73, 0xc2, 0xe3, - 0x3d, 0x85, 0xed, 0xf1, 0x49, 0x3e, 0x8e, 0xc4, 0xde, 0xf4, 0xc0, 0x63, 0x85, 0xa4, 0x2c, 0x17, - 0x5e, 0x89, 0xb8, 0x05, 0x67, 0x92, 0xa1, 0xcd, 0x8f, 0x7a, 0xd7, 0x10, 0xd3, 0x83, 0xad, 0xcd, - 0x84, 0x25, 0x4c, 0x0b, 0x3c, 0xb5, 0x2a, 0xb5, 0x5b, 0xed, 0x84, 0xb1, 0x24, 0x25, 0x9e, 0xde, - 0x85, 0x93, 0x4b, 0x4f, 0xd2, 0x8c, 0x08, 0x19, 0x64, 0x45, 0x29, 0xd8, 0xf9, 0xb5, 0x0e, 0xf5, - 0xb3, 0xf2, 0x16, 0xb4, 0x09, 0x8b, 0x31, 0x09, 0x27, 0x89, 0x63, 0x75, 0xac, 0xdd, 0x86, 0x5f, - 0x6e, 0xd0, 0x11, 0x80, 0x5e, 0x60, 0x39, 0x2b, 0x88, 0xf3, 0xa0, 0x63, 0xed, 0xae, 0xbd, 0x7c, - 0xe6, 0xde, 0x17, 0x83, 0x6b, 0x8c, 0xdc, 0x9e, 0xd2, 0x9f, 0xcf, 0x0a, 0xe2, 0xdb, 0x71, 0xb5, - 0x44, 0x4f, 0x61, 0x95, 0x93, 0x84, 0x0a, 0xc9, 0x67, 0x98, 0x33, 0x26, 0x9d, 0x87, 0x1d, 0x6b, - 0xd7, 0xf6, 0x57, 0x2a, 0xd0, 0x67, 0x4c, 0x2a, 0x91, 0x08, 0xf2, 0x38, 0x64, 0x57, 0x98, 0x66, - 0x41, 0x42, 0x9c, 0x85, 0x52, 0x64, 0xc0, 0x81, 0xc2, 0xd0, 0x73, 0x68, 0x56, 0xa2, 0x22, 0x0d, - 0xe4, 0x25, 0xe3, 0x99, 0xb3, 0xa8, 0x75, 0xeb, 0x06, 0x1f, 0x1a, 0x18, 0xfd, 0x08, 0x1b, 0xb7, - 0x7e, 0x82, 0xa5, 0x81, 0x8a, 0xcf, 0x59, 0xd2, 0x39, 0xb8, 0xff, 0x9e, 0xc3, 0xc8, 0xdc, 0x58, - 0x9d, 0xf2, 0xab, 0x3b, 0x6f, 0x11, 0xe4, 0xc1, 0x66, 0xc8, 0x98, 0xc4, 0x97, 0x34, 0x25, 0x42, - 0xe7, 0x84, 0x8b, 0x40, 0x8e, 0x9d, 0xba, 0x8e, 0x65, 0x43, 0x71, 0x47, 0x8a, 0x52, 0x99, 0x0d, - 0x03, 0x39, 0x46, 0x2f, 0x00, 0x4d, 0x33, 0x5c, 0x70, 0x16, 0x11, 0x21, 0x18, 0xc7, 0x11, 0x9b, - 0xe4, 0xd2, 0x69, 0x74, 0xac, 0xdd, 0x45, 0xbf, 0x39, 0xcd, 0x86, 0x15, 0xd1, 0x55, 0x38, 0x72, - 0x61, 0x73, 0x9a, 0xe1, 0x8c, 0x64, 0x8c, 0xcf, 0xb0, 0xa0, 0xef, 0x09, 0xa6, 0x39, 0xce, 0x42, - 0xc7, 0xae, 0xf4, 0x27, 0x9a, 0x1a, 0xd1, 0xf7, 0x64, 0x90, 0x9f, 0x84, 0xa8, 0x05, 0xf0, 0x7a, - 0xf8, 0xed, 0xc5, 0x9b, 0x9e, 0xba, 0xcb, 0x01, 0x1d, 0xc4, 0x27, 0x08, 0xfa, 0x0a, 0xb6, 0x45, - 0x14, 0xa4, 0x04, 0x47, 0xc5, 0x04, 0xa7, 0x34, 0xa3, 0x52, 0x60, 0xc9, 0xb0, 0x49, 0xcb, 0x59, - 0xd6, 0x1f, 0xfd, 0xb1, 0x96, 0x74, 0x8b, 0xc9, 0xb1, 0x16, 0x9c, 0x33, 0x53, 0x07, 0x74, 0x02, - 0xff, 0x8f, 0xc9, 0x65, 0x30, 0x49, 0x25, 0xbe, 0xad, 0x1b, 0x16, 0x11, 0x0f, 0x64, 0x34, 0xbe, - 0x8d, 0x2e, 0x09, 0x9d, 0x15, 0x1d, 0x5d, 0xdb, 0x68, 0xbb, 0x95, 0x74, 0x54, 0x2a, 0xcb, 0x60, - 0x5f, 0x87, 0xe8, 0x6b, 0x78, 0x52, 0xd9, 0x4d, 0xb3, 0xfb, 0x7c, 0x56, 0xb5, 0x8f, 0x63, 0x44, - 0x17, 0xd9, 0x5d, 0x03, 0xd5, 0x29, 0xe3, 0x80, 0x93, 0xea, 0xac, 0xb3, 0xa6, 0xe3, 0x5f, 0xd1, - 0xa0, 0x11, 0xa3, 0x0e, 0x2c, 0x9f, 0x76, 0x87, 0x9c, 0x5d, 0xcd, 0x5e, 0xc5, 0x31, 0x77, 0xd6, - 0x75, 0x4d, 0x3e, 0x85, 0xd0, 0x36, 0xd8, 0x29, 0x4b, 0x70, 0x4a, 0xa6, 0x24, 0x75, 0x9a, 0x9a, - 0x6f, 0xa4, 0x2c, 0x39, 0x56, 0x7b, 0xf4, 0x05, 0x3c, 0xa6, 0x0c, 0x73, 0xa2, 0x5a, 0x56, 0x0d, - 0x0e, 0x9b, 0x48, 0x15, 0x9d, 0x20, 0x91, 0xb3, 0xa1, 0xc3, 0x7b, 0x44, 0x99, 0xaf, 0xd8, 0xf3, - 0x92, 0x1c, 0xe4, 0x23, 0x12, 0xed, 0x3c, 0x07, 0xfb, 0x76, 0x00, 0x90, 0x0d, 0x8b, 0xa7, 0xc3, - 0xc1, 0xb0, 0xdf, 0xac, 0xa1, 0x06, 0x2c, 0x1c, 0x0d, 0x8e, 0xfb, 0x4d, 0x0b, 0xd5, 0xe1, 0x61, - 0xff, 0xfc, 0x6d, 0xf3, 0xc1, 0x8e, 0x07, 0xcd, 0xbb, 0x7d, 0x86, 0x96, 0xa1, 0x3e, 0xf4, 0xcf, - 0xba, 0xfd, 0xd1, 0xa8, 0x59, 0x43, 0x6b, 0x00, 0x6f, 0xbe, 0x1f, 0xf6, 0xfd, 0x8b, 0xc1, 0xe8, - 0xcc, 0x6f, 0x5a, 0x3b, 0x7f, 0x3c, 0x84, 0x35, 0xd3, 0x26, 0x3d, 0x22, 0x03, 0x9a, 0x0a, 0xf4, - 0x04, 0x40, 0x8f, 0x0a, 0xce, 0x83, 0x8c, 0xe8, 0xd1, 0xb5, 0x7d, 0x5b, 0x23, 0xa7, 0x41, 0x46, - 0x50, 0x17, 0x20, 0xe2, 0x24, 0x90, 0x24, 0xc6, 0x81, 0xd4, 0xe3, 0xbb, 0xfc, 0x72, 0xcb, 0x2d, - 0x9f, 0x05, 0xb7, 0x7a, 0x16, 0xdc, 0xf3, 0xea, 0x59, 0x38, 0x6c, 0x5c, 0xdf, 0xb4, 0x6b, 0xbf, - 0xfc, 0xd9, 0xb6, 0x7c, 0xdb, 0x9c, 0x7b, 0x25, 0xd1, 0x67, 0x80, 0xde, 0x11, 0x9e, 0x93, 0x54, - 0x97, 0x01, 0x1f, 0xec, 0xef, 0xe3, 0x5c, 0xe8, 0x01, 0x5e, 0xf0, 0xd7, 0x4b, 0x46, 0x39, 0x1c, - 0xec, 0xef, 0x9f, 0x0a, 0xe4, 0xc2, 0x23, 0xd3, 0xb4, 0x11, 0xcb, 0x32, 0x2a, 0x71, 0x38, 0x93, - 0x44, 0xe8, 0x49, 0x5e, 0xf0, 0x37, 0x4a, 0xaa, 0xab, 0x99, 0x43, 0x45, 0xa0, 0x23, 0xe8, 0x18, - 0xfd, 0x4f, 0x8c, 0xbf, 0xa3, 0x79, 0x82, 0x05, 0x91, 0xb8, 0xe0, 0x74, 0x1a, 0x48, 0x62, 0x0e, - 0x2f, 0xea, 0xc3, 0xff, 0x2b, 0x75, 0x6f, 0x4b, 0xd9, 0x88, 0xc8, 0x61, 0x29, 0x2a, 0x7d, 0x7a, - 0xd0, 0xbe, 0xc7, 0x47, 0xf7, 0x43, 0x6c, 0x6c, 0x96, 0xb4, 0xcd, 0xf6, 0x5d, 0x9b, 0x91, 0xd6, - 0x94, 0x2e, 0x2f, 0x00, 0xcc, 0x80, 0x62, 0x1a, 0xeb, 0x51, 0x5e, 0x3d, 0x5c, 0x9d, 0xdf, 0xb4, - 0x6d, 0x53, 0xf6, 0x41, 0xcf, 0xb7, 0x8d, 0x60, 0x10, 0xa3, 0x67, 0xd0, 0x9c, 0x08, 0xc2, 0xff, - 0x51, 0x96, 0x86, 0xbe, 0x64, 0x55, 0xe1, 0x1f, 0x8b, 0xf2, 0x14, 0xea, 0xe4, 0x8a, 0x44, 0xca, - 0x53, 0xcd, 0xaf, 0x7d, 0x08, 0xf3, 0x9b, 0xf6, 0x52, 0xff, 0x8a, 0x44, 0x83, 0x9e, 0xbf, 0xa4, - 0xa8, 0x41, 0x7c, 0x18, 0x5f, 0x7f, 0x68, 0xd5, 0x7e, 0xff, 0xd0, 0xaa, 0xfd, 0x3c, 0x6f, 0x59, - 0xd7, 0xf3, 0x96, 0xf5, 0xdb, 0xbc, 0x65, 0xfd, 0x35, 0x6f, 0x59, 0x3f, 0x7c, 0xf3, 0xdf, 0xff, - 0x44, 0xbe, 0x34, 0xbf, 0xdf, 0xd5, 0xc2, 0x25, 0xfd, 0xdd, 0x3f, 0xff, 0x3b, 0x00, 0x00, 0xff, - 0xff, 0x6b, 0x83, 0xa6, 0x5f, 0x9b, 0x06, 0x00, 0x00, + // 1028 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xe3, 0x36, + 0x17, 0xb5, 0xf2, 0xb4, 0x6e, 0x5e, 0x0e, 0x27, 0xc0, 0x08, 0xc9, 0x8c, 0x6d, 0x64, 0x3e, 0x60, + 0x32, 0xf8, 0x26, 0x52, 0x92, 0x76, 0x51, 0xf4, 0x81, 0x22, 0xb1, 0x9d, 0x8c, 0x8b, 0x3c, 0x0c, + 0x39, 0xcd, 0xf4, 0xb1, 0x20, 0xf4, 0x60, 0x64, 0x21, 0x92, 0x28, 0x88, 0x94, 0x1b, 0xcf, 0xa6, + 0xfd, 0x09, 0xfd, 0x59, 0x59, 0x76, 0x59, 0xa0, 0x40, 0xda, 0xf1, 0xef, 0xe8, 0xa2, 0x20, 0x45, + 0x39, 0x69, 0x90, 0x4e, 0x17, 0x5d, 0x99, 0x3c, 0xe7, 0xdc, 0xc3, 0xcb, 0x2b, 0xde, 0x6b, 0x38, + 0x0b, 0x42, 0x3e, 0xc8, 0x5d, 0xd3, 0xa3, 0xb1, 0x75, 0x12, 0x7a, 0x19, 0x65, 0xf4, 0x92, 0x5b, + 0x03, 0x8f, 0xb1, 0x41, 0x18, 0x5b, 0x5e, 0xec, 0x5b, 0x1e, 0x4d, 0xb8, 0x13, 0x26, 0x24, 0xf3, + 0xb7, 0x05, 0xb6, 0x9d, 0xe5, 0xc9, 0xc0, 0x63, 0xdb, 0xc3, 0x5d, 0x8b, 0xa6, 0x3c, 0xa4, 0x09, + 0xb3, 0x0a, 0xc4, 0x4c, 0x33, 0xca, 0x29, 0x5a, 0xbb, 0xd3, 0x9b, 0x8a, 0x18, 0xee, 0xae, 0xaf, + 0x05, 0x34, 0xa0, 0x52, 0x60, 0x89, 0x55, 0xa1, 0x5d, 0x6f, 0x04, 0x94, 0x06, 0x11, 0xb1, 0xe4, + 0xce, 0xcd, 0x2f, 0x2d, 0x1e, 0xc6, 0x84, 0x71, 0x27, 0x4e, 0x0b, 0xc1, 0xe6, 0x9f, 0x55, 0x98, + 0x3f, 0x2b, 0x4e, 0x41, 0x6b, 0x30, 0xeb, 0x13, 0x37, 0x0f, 0x0c, 0xad, 0xa9, 0x6d, 0x55, 0xed, + 0x62, 0x83, 0x0e, 0x01, 0xe4, 0x02, 0xf3, 0x51, 0x4a, 0x8c, 0xa9, 0xa6, 0xb6, 0xb5, 0xbc, 0xf7, + 0xd2, 0x7c, 0x2c, 0x07, 0x53, 0x19, 0x99, 0x6d, 0xa1, 0x3f, 0x1f, 0xa5, 0xc4, 0xd6, 0xfd, 0x72, + 0x89, 0x5e, 0xc0, 0x52, 0x46, 0x82, 0x90, 0xf1, 0x6c, 0x84, 0x33, 0x4a, 0xb9, 0x31, 0xdd, 0xd4, + 0xb6, 0x74, 0x7b, 0xb1, 0x04, 0x6d, 0x4a, 0xb9, 0x10, 0x31, 0x27, 0xf1, 0x5d, 0x7a, 0x8d, 0xc3, + 0xd8, 0x09, 0x88, 0x31, 0x53, 0x88, 0x14, 0xd8, 0x15, 0x18, 0x7a, 0x05, 0xb5, 0x52, 0x94, 0x46, + 0x0e, 0xbf, 0xa4, 0x59, 0x6c, 0xcc, 0x4a, 0xdd, 0x8a, 0xc2, 0x7b, 0x0a, 0x46, 0xdf, 0xc3, 0xea, + 0xc4, 0x8f, 0xd1, 0xc8, 0x11, 0xf9, 0x19, 0x73, 0xf2, 0x0e, 0xe6, 0x87, 0xef, 0xd0, 0x57, 0x27, + 0x96, 0x51, 0x76, 0x79, 0xe6, 0x04, 0x41, 0x16, 0xac, 0xb9, 0x94, 0x72, 0x7c, 0x19, 0x46, 0x84, + 0xc9, 0x3b, 0xe1, 0xd4, 0xe1, 0x03, 0x63, 0x5e, 0xe6, 0xb2, 0x2a, 0xb8, 0x43, 0x41, 0x89, 0x9b, + 0xf5, 0x1c, 0x3e, 0x40, 0xaf, 0x01, 0x0d, 0x63, 0x9c, 0x66, 0xd4, 0x23, 0x8c, 0xd1, 0x0c, 0x7b, + 0x34, 0x4f, 0xb8, 0x51, 0x6d, 0x6a, 0x5b, 0xb3, 0x76, 0x6d, 0x18, 0xf7, 0x4a, 0xa2, 0x25, 0x70, + 0x64, 0xc2, 0xda, 0x30, 0xc6, 0x31, 0x89, 0x69, 0x36, 0xc2, 0x2c, 0x7c, 0x47, 0x70, 0x98, 0xe0, + 0xd8, 0x35, 0xf4, 0x52, 0x7f, 0x22, 0xa9, 0x7e, 0xf8, 0x8e, 0x74, 0x93, 0x13, 0x17, 0xd5, 0x01, + 0x8e, 0x7a, 0x5f, 0x5f, 0xbc, 0x69, 0x8b, 0xb3, 0x0c, 0x90, 0x49, 0xdc, 0x43, 0xd0, 0xe7, 0xb0, + 0xc1, 0x3c, 0x27, 0x22, 0xd8, 0x4b, 0x73, 0x1c, 0x85, 0x71, 0xc8, 0x19, 0xe6, 0x14, 0xab, 0x6b, + 0x19, 0x0b, 0xf2, 0xa3, 0x3f, 0x95, 0x92, 0x56, 0x9a, 0x1f, 0x4b, 0xc1, 0x39, 0x55, 0x75, 0x40, + 0x27, 0xf0, 0x3f, 0x9f, 0x5c, 0x3a, 0x79, 0xc4, 0xf1, 0xa4, 0x6e, 0x98, 0x79, 0x99, 0xc3, 0xbd, + 0xc1, 0x24, 0xbb, 0xc0, 0x35, 0x16, 0x65, 0x76, 0x0d, 0xa5, 0x6d, 0x95, 0xd2, 0x7e, 0xa1, 0x2c, + 0x92, 0x3d, 0x72, 0xd1, 0x97, 0xf0, 0xbc, 0xb4, 0x1b, 0xc6, 0x8f, 0xf9, 0x2c, 0x49, 0x1f, 0x43, + 0x89, 0x2e, 0xe2, 0x87, 0x06, 0xe2, 0xa5, 0x0c, 0x9c, 0x8c, 0x94, 0xb1, 0xc6, 0xb2, 0xcc, 0x7f, + 0x51, 0x82, 0x4a, 0x8c, 0x9a, 0xb0, 0x70, 0xda, 0xea, 0x65, 0xf4, 0x7a, 0xb4, 0xef, 0xfb, 0x99, + 0xb1, 0x22, 0x6b, 0x72, 0x1f, 0x42, 0x1b, 0xa0, 0x47, 0x34, 0xc0, 0x11, 0x19, 0x92, 0xc8, 0xa8, + 0x49, 0xbe, 0x1a, 0xd1, 0xe0, 0x58, 0xec, 0xd1, 0xc7, 0xf0, 0x34, 0xa4, 0x38, 0x23, 0xe2, 0xc9, + 0x8a, 0xc6, 0xa1, 0x39, 0x17, 0xd9, 0x31, 0xe2, 0x19, 0xab, 0x32, 0xbd, 0x27, 0x21, 0xb5, 0x05, + 0x7b, 0x5e, 0x90, 0xdd, 0xa4, 0x4f, 0x3c, 0xf4, 0x23, 0x3c, 0x0b, 0x22, 0xea, 0x3a, 0xd1, 0xbd, + 0x42, 0x39, 0x49, 0x42, 0xb9, 0x7c, 0x35, 0xcc, 0x40, 0xcd, 0xe9, 0xad, 0x85, 0xbd, 0x2f, 0x3e, + 0xfc, 0xfc, 0x8e, 0xa4, 0xc3, 0xa4, 0x7c, 0xfb, 0x77, 0xf1, 0x9d, 0x44, 0x34, 0xcb, 0x7a, 0xf0, + 0x8f, 0x82, 0xf5, 0x13, 0x68, 0xfc, 0x4b, 0x38, 0xaa, 0xc1, 0xf4, 0x15, 0x19, 0xc9, 0x46, 0xd7, + 0x6d, 0xb1, 0x14, 0xcd, 0x3f, 0x74, 0xa2, 0xbc, 0xe8, 0x70, 0xdd, 0x2e, 0x36, 0x9f, 0x4e, 0x7d, + 0xa2, 0x6d, 0xbe, 0x02, 0x7d, 0xd2, 0xd0, 0x48, 0x87, 0xd9, 0xd3, 0x5e, 0xb7, 0xd7, 0xa9, 0x55, + 0x50, 0x15, 0x66, 0x0e, 0xbb, 0xc7, 0x9d, 0x9a, 0x86, 0xe6, 0x61, 0xba, 0x73, 0xfe, 0xb6, 0x36, + 0xb5, 0x69, 0x41, 0xed, 0x61, 0xdf, 0xa0, 0x05, 0x98, 0xef, 0xd9, 0x67, 0xad, 0x4e, 0xbf, 0x5f, + 0xab, 0xa0, 0x65, 0x80, 0x37, 0xdf, 0xf6, 0x3a, 0xf6, 0x45, 0xb7, 0x7f, 0x66, 0xd7, 0xb4, 0xcd, + 0xdf, 0xa6, 0x61, 0x59, 0x3d, 0xfb, 0x36, 0xe1, 0x4e, 0x18, 0x31, 0xf4, 0x1c, 0x40, 0xb6, 0x3e, + 0x4e, 0x9c, 0x98, 0xa8, 0x0c, 0x75, 0x89, 0x9c, 0x3a, 0x31, 0x41, 0x2d, 0x00, 0x2f, 0x23, 0x0e, + 0x27, 0x3e, 0x76, 0xb8, 0x4c, 0x76, 0x61, 0x6f, 0xdd, 0x2c, 0xc6, 0x9c, 0x59, 0x8e, 0x39, 0xf3, + 0xbc, 0x1c, 0x73, 0x07, 0xd5, 0x9b, 0xdb, 0x46, 0xe5, 0xe7, 0xdf, 0x1b, 0x9a, 0xad, 0xab, 0xb8, + 0x7d, 0x8e, 0xfe, 0x0f, 0xe8, 0x8a, 0x64, 0x09, 0x89, 0xe4, 0x67, 0xc5, 0xbb, 0x3b, 0x3b, 0x38, + 0x61, 0x72, 0x20, 0xcd, 0xd8, 0x2b, 0x05, 0x23, 0x1c, 0x76, 0x77, 0x76, 0x4e, 0x19, 0x32, 0xe1, + 0x89, 0x6a, 0x42, 0x8f, 0xc6, 0x71, 0xc8, 0xb1, 0x3b, 0xe2, 0x84, 0xc9, 0xc9, 0x34, 0x63, 0xaf, + 0x16, 0x54, 0x4b, 0x32, 0x07, 0x82, 0x40, 0x87, 0xd0, 0x54, 0xfa, 0x1f, 0x68, 0x76, 0x15, 0x26, + 0x01, 0x66, 0x84, 0xe3, 0x34, 0x0b, 0x87, 0x0e, 0x27, 0x2a, 0x78, 0x56, 0x06, 0x3f, 0x2b, 0x74, + 0x6f, 0x0b, 0x59, 0x9f, 0xf0, 0x5e, 0x21, 0x2a, 0x7c, 0xda, 0xd0, 0x78, 0xc4, 0x47, 0xbe, 0x6f, + 0x5f, 0xd9, 0xcc, 0x49, 0x9b, 0x8d, 0x87, 0x36, 0x7d, 0xa9, 0x29, 0x5c, 0x5e, 0x03, 0xa8, 0x81, + 0x83, 0x43, 0x5f, 0x8e, 0xa6, 0xa5, 0x83, 0xa5, 0xf1, 0x6d, 0x43, 0x57, 0x65, 0xef, 0xb6, 0x6d, + 0x5d, 0x09, 0xba, 0x3e, 0x7a, 0x09, 0xb5, 0x9c, 0x91, 0xec, 0x6f, 0x65, 0xa9, 0xca, 0x43, 0x96, + 0x04, 0x7e, 0x57, 0x94, 0x17, 0x30, 0x4f, 0xae, 0x89, 0x27, 0x3c, 0xc5, 0x3c, 0xd2, 0x0f, 0x60, + 0x7c, 0xdb, 0x98, 0xeb, 0x5c, 0x13, 0xaf, 0xdb, 0xb6, 0xe7, 0x04, 0xd5, 0xf5, 0x0f, 0xfc, 0x9b, + 0xf7, 0xf5, 0xca, 0xaf, 0xef, 0xeb, 0x95, 0x9f, 0xc6, 0x75, 0xed, 0x66, 0x5c, 0xd7, 0x7e, 0x19, + 0xd7, 0xb5, 0x3f, 0xc6, 0x75, 0xed, 0xbb, 0xaf, 0xfe, 0xfb, 0x9f, 0xe2, 0x67, 0xea, 0xf7, 0x9b, + 0x8a, 0x3b, 0x27, 0xbf, 0xfb, 0x47, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xf3, 0xdd, 0xed, + 0x6b, 0x07, 0x00, 0x00, } func (m *Options) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -316,131 +326,165 @@ func (m *Options) Marshal() (dAtA []byte, err error) { } func (m *Options) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Options) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Debug { - dAtA[i] = 0x8 - i++ - if m.Debug { + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.GlobalContainerAnnotations) > 0 { + for k := range m.GlobalContainerAnnotations { + v := m.GlobalContainerAnnotations[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintRunhcs(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintRunhcs(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintRunhcs(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + } + if m.IoRetryTimeoutInSec != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.IoRetryTimeoutInSec)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x88 + } + if len(m.LogLevel) > 0 { + i -= len(m.LogLevel) + copy(dAtA[i:], m.LogLevel) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + if len(m.NCProxyAddr) > 0 { + i -= len(m.NCProxyAddr) + copy(dAtA[i:], m.NCProxyAddr) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr))) + i-- + dAtA[i] = 0x7a + } + if m.ShareScratch { + i-- + if m.ShareScratch { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - } - if m.DebugType != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType)) + i-- + dAtA[i] = 0x70 } - if len(m.RegistryRoot) > 0 { - dAtA[i] = 0x1a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot))) - i += copy(dAtA[i:], m.RegistryRoot) + if m.DefaultVmScratchSizeInGb != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb)) + i-- + dAtA[i] = 0x68 } - if len(m.SandboxImage) > 0 { - dAtA[i] = 0x22 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage))) - i += copy(dAtA[i:], m.SandboxImage) + if m.DefaultContainerScratchSizeInGb != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb)) + i-- + dAtA[i] = 0x60 } - if len(m.SandboxPlatform) > 0 { - dAtA[i] = 0x2a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform))) - i += copy(dAtA[i:], m.SandboxPlatform) + if m.ScaleCpuLimitsToSandbox { + i-- + if m.ScaleCpuLimitsToSandbox { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x58 } - if m.SandboxIsolation != 0 { - dAtA[i] = 0x30 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation)) + if len(m.GPUVHDPath) > 0 { + i -= len(m.GPUVHDPath) + copy(dAtA[i:], m.GPUVHDPath) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath))) + i-- + dAtA[i] = 0x52 } - if len(m.BootFilesRootPath) > 0 { - dAtA[i] = 0x3a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath))) - i += copy(dAtA[i:], m.BootFilesRootPath) + if m.VmMemorySizeInMb != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb)) + i-- + dAtA[i] = 0x48 } if m.VmProcessorCount != 0 { - dAtA[i] = 0x40 - i++ i = encodeVarintRunhcs(dAtA, i, uint64(m.VmProcessorCount)) + i-- + dAtA[i] = 0x40 } - if m.VmMemorySizeInMb != 0 { - dAtA[i] = 0x48 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb)) + if len(m.BootFilesRootPath) > 0 { + i -= len(m.BootFilesRootPath) + copy(dAtA[i:], m.BootFilesRootPath) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath))) + i-- + dAtA[i] = 0x3a } - if len(m.GPUVHDPath) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath))) - i += copy(dAtA[i:], m.GPUVHDPath) + if m.SandboxIsolation != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation)) + i-- + dAtA[i] = 0x30 } - if m.ScaleCpuLimitsToSandbox { - dAtA[i] = 0x58 - i++ - if m.ScaleCpuLimitsToSandbox { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.SandboxPlatform) > 0 { + i -= len(m.SandboxPlatform) + copy(dAtA[i:], m.SandboxPlatform) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform))) + i-- + dAtA[i] = 0x2a } - if m.DefaultContainerScratchSizeInGb != 0 { - dAtA[i] = 0x60 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb)) + if len(m.SandboxImage) > 0 { + i -= len(m.SandboxImage) + copy(dAtA[i:], m.SandboxImage) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage))) + i-- + dAtA[i] = 0x22 } - if m.DefaultVmScratchSizeInGb != 0 { - dAtA[i] = 0x68 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb)) + if len(m.RegistryRoot) > 0 { + i -= len(m.RegistryRoot) + copy(dAtA[i:], m.RegistryRoot) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot))) + i-- + dAtA[i] = 0x1a } - if m.ShareScratch { - dAtA[i] = 0x70 - i++ - if m.ShareScratch { + if m.DebugType != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType)) + i-- + dAtA[i] = 0x10 + } + if m.Debug { + i-- + if m.Debug { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - } - if len(m.NCProxyAddr) > 0 { - dAtA[i] = 0x7a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr))) - i += copy(dAtA[i:], m.NCProxyAddr) - } - if len(m.LogLevel) > 0 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel))) - i += copy(dAtA[i:], m.LogLevel) - } - if m.IoRetryTimeoutInSec != 0 { - dAtA[i] = 0x88 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.IoRetryTimeoutInSec)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *ProcessDetails) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -448,74 +492,84 @@ func (m *ProcessDetails) Marshal() (dAtA []byte, err error) { } func (m *ProcessDetails) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ProcessDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.ImageName) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName))) - i += copy(dAtA[i:], m.ImageName) - } - dAtA[i] = 0x12 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt))) - n1, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i:]) - if err != nil { - return 0, err + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n1 - if m.KernelTime_100Ns != 0 { - dAtA[i] = 0x18 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns)) + if len(m.ExecID) > 0 { + i -= len(m.ExecID) + copy(dAtA[i:], m.ExecID) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID))) + i-- + dAtA[i] = 0x4a } - if m.MemoryCommitBytes != 0 { - dAtA[i] = 0x20 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes)) + if m.UserTime_100Ns != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns)) + i-- + dAtA[i] = 0x40 } - if m.MemoryWorkingSetPrivateBytes != 0 { - dAtA[i] = 0x28 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes)) + if m.ProcessID != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID)) + i-- + dAtA[i] = 0x38 } if m.MemoryWorkingSetSharedBytes != 0 { - dAtA[i] = 0x30 - i++ i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetSharedBytes)) + i-- + dAtA[i] = 0x30 } - if m.ProcessID != 0 { - dAtA[i] = 0x38 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID)) + if m.MemoryWorkingSetPrivateBytes != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes)) + i-- + dAtA[i] = 0x28 } - if m.UserTime_100Ns != 0 { - dAtA[i] = 0x40 - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns)) + if m.MemoryCommitBytes != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes)) + i-- + dAtA[i] = 0x20 } - if len(m.ExecID) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID))) - i += copy(dAtA[i:], m.ExecID) + if m.KernelTime_100Ns != 0 { + i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):]) + if err1 != nil { + return 0, err1 } - return i, nil + i -= n1 + i = encodeVarintRunhcs(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x12 + if len(m.ImageName) > 0 { + i -= len(m.ImageName) + copy(dAtA[i:], m.ImageName) + i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func encodeVarintRunhcs(dAtA []byte, offset int, v uint64) int { + offset -= sovRunhcs(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Options) Size() (n int) { if m == nil { @@ -581,6 +635,14 @@ func (m *Options) Size() (n int) { if m.IoRetryTimeoutInSec != 0 { n += 2 + sovRunhcs(uint64(m.IoRetryTimeoutInSec)) } + if len(m.GlobalContainerAnnotations) > 0 { + for k, v := range m.GlobalContainerAnnotations { + _ = k + _ = v + mapEntrySize := 1 + len(k) + sovRunhcs(uint64(len(k))) + 1 + len(v) + sovRunhcs(uint64(len(v))) + n += mapEntrySize + 2 + sovRunhcs(uint64(mapEntrySize)) + } + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -628,14 +690,7 @@ func (m *ProcessDetails) Size() (n int) { } func sovRunhcs(x uint64) (n int) { - for { - n++ - x >>= 7 - if x == 0 { - break - } - } - return n + return (math_bits.Len64(x|1) + 6) / 7 } func sozRunhcs(x uint64) (n int) { return sovRunhcs(uint64((x << 1) ^ uint64((int64(x) >> 63)))) @@ -644,6 +699,16 @@ func (this *Options) String() string { if this == nil { return "nil" } + keysForGlobalContainerAnnotations := make([]string, 0, len(this.GlobalContainerAnnotations)) + for k, _ := range this.GlobalContainerAnnotations { + keysForGlobalContainerAnnotations = append(keysForGlobalContainerAnnotations, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForGlobalContainerAnnotations) + mapStringForGlobalContainerAnnotations := "map[string]string{" + for _, k := range keysForGlobalContainerAnnotations { + mapStringForGlobalContainerAnnotations += fmt.Sprintf("%v: %v,", k, this.GlobalContainerAnnotations[k]) + } + mapStringForGlobalContainerAnnotations += "}" s := strings.Join([]string{`&Options{`, `Debug:` + fmt.Sprintf("%v", this.Debug) + `,`, `DebugType:` + fmt.Sprintf("%v", this.DebugType) + `,`, @@ -662,6 +727,7 @@ func (this *Options) String() string { `NCProxyAddr:` + fmt.Sprintf("%v", this.NCProxyAddr) + `,`, `LogLevel:` + fmt.Sprintf("%v", this.LogLevel) + `,`, `IoRetryTimeoutInSec:` + fmt.Sprintf("%v", this.IoRetryTimeoutInSec) + `,`, + `GlobalContainerAnnotations:` + mapStringForGlobalContainerAnnotations + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -673,7 +739,7 @@ func (this *ProcessDetails) String() string { } s := strings.Join([]string{`&ProcessDetails{`, `ImageName:` + fmt.Sprintf("%v", this.ImageName) + `,`, - `CreatedAt:` + strings.Replace(strings.Replace(this.CreatedAt.String(), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`, + `CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`, `KernelTime_100Ns:` + fmt.Sprintf("%v", this.KernelTime_100Ns) + `,`, `MemoryCommitBytes:` + fmt.Sprintf("%v", this.MemoryCommitBytes) + `,`, `MemoryWorkingSetPrivateBytes:` + fmt.Sprintf("%v", this.MemoryWorkingSetPrivateBytes) + `,`, @@ -1140,16 +1206,140 @@ func (m *Options) Unmarshal(dAtA []byte) error { break } } + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GlobalContainerAnnotations", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRunhcs + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRunhcs + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.GlobalContainerAnnotations == nil { + m.GlobalContainerAnnotations = make(map[string]string) + } + var mapkey string + var mapvalue string + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthRunhcs + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthRunhcs + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var stringLenmapvalue uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapvalue |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapvalue := int(stringLenmapvalue) + if intStringLenmapvalue < 0 { + return ErrInvalidLengthRunhcs + } + postStringIndexmapvalue := iNdEx + intStringLenmapvalue + if postStringIndexmapvalue < 0 { + return ErrInvalidLengthRunhcs + } + if postStringIndexmapvalue > l { + return io.ErrUnexpectedEOF + } + mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) + iNdEx = postStringIndexmapvalue + } else { + iNdEx = entryPreIndex + skippy, err := skipRunhcs(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthRunhcs + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.GlobalContainerAnnotations[mapkey] = mapvalue + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRunhcs(dAtA[iNdEx:]) if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthRunhcs - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthRunhcs } if (iNdEx + skippy) > l { @@ -1411,10 +1601,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthRunhcs - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthRunhcs } if (iNdEx + skippy) > l { @@ -1433,6 +1620,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error { func skipRunhcs(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1464,10 +1652,8 @@ func skipRunhcs(dAtA []byte) (n int, err error) { break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1488,55 +1674,30 @@ func skipRunhcs(dAtA []byte) (n int, err error) { return 0, ErrInvalidLengthRunhcs } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthRunhcs - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowRunhcs - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipRunhcs(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthRunhcs - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupRunhcs + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthRunhcs + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthRunhcs = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowRunhcs = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthRunhcs = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowRunhcs = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupRunhcs = fmt.Errorf("proto: unexpected end of group") ) diff --git a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto index 60c89adbde..c193e2256c 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto +++ b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto @@ -98,6 +98,9 @@ message Options { // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite // timeout. int32 io_retry_timeout_in_sec = 17; + + // global_container_annotations specifies a set of annotations that should be set for every workload container + map global_container_annotations = 18; } // ProcessDetails contains additional information about a process. This is the additional From c5f2a396f7f70fdc9727e30b820dd737fb7c0555 Mon Sep 17 00:00:00 2001 From: Maksim An Date: Thu, 28 Oct 2021 15:08:49 -0700 Subject: [PATCH 2/3] Set container spec Annotations from runhcs options Signed-off-by: Maksim An --- internal/oci/uvm.go | 6 ++++++ .../vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/internal/oci/uvm.go b/internal/oci/uvm.go index 29bda6ccfc..3e29b75d50 100644 --- a/internal/oci/uvm.go +++ b/internal/oci/uvm.go @@ -395,5 +395,11 @@ func UpdateSpecFromOptions(s specs.Spec, opts *runhcsopts.Options) specs.Spec { s.Annotations[annotations.NetworkConfigProxy] = opts.NCProxyAddr } + for key, value := range opts.GlobalContainerAnnotations { + // Make sure not to override any annotations which are set explicitly + if _, ok := s.Annotations[key]; !ok { + s.Annotations[key] = value + } + } return s } diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go b/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go index 29bda6ccfc..3e29b75d50 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go +++ b/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go @@ -395,5 +395,11 @@ func UpdateSpecFromOptions(s specs.Spec, opts *runhcsopts.Options) specs.Spec { s.Annotations[annotations.NetworkConfigProxy] = opts.NCProxyAddr } + for key, value := range opts.GlobalContainerAnnotations { + // Make sure not to override any annotations which are set explicitly + if _, ok := s.Annotations[key]; !ok { + s.Annotations[key] = value + } + } return s } From e1d85dc9314ba5382fa8655dd92d55a1f82dddf7 Mon Sep 17 00:00:00 2001 From: Maksim An Date: Tue, 9 Nov 2021 22:09:02 -0800 Subject: [PATCH 3/3] Update field name to DefaultContainerAnnotations Signed-off-by: Maksim An --- .../options/runhcs.pb.go | 179 +++++++++--------- .../options/runhcs.proto | 4 +- internal/oci/uvm.go | 2 +- .../options/runhcs.pb.go | 179 +++++++++--------- .../options/runhcs.proto | 4 +- .../Microsoft/hcsshim/internal/oci/uvm.go | 2 +- 6 files changed, 184 insertions(+), 186 deletions(-) diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go index e9e438215e..ff04b224fe 100644 --- a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go +++ b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go @@ -146,11 +146,11 @@ type Options struct { // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite // timeout. IoRetryTimeoutInSec int32 `protobuf:"varint,17,opt,name=io_retry_timeout_in_sec,json=ioRetryTimeoutInSec,proto3" json:"io_retry_timeout_in_sec,omitempty"` - // global_container_annotations specifies a set of annotations that should be set for every workload container - GlobalContainerAnnotations map[string]string `protobuf:"bytes,18,rep,name=global_container_annotations,json=globalContainerAnnotations,proto3" json:"global_container_annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // default_container_annotations specifies a set of annotations that should be set for every workload container + DefaultContainerAnnotations map[string]string `protobuf:"bytes,18,rep,name=default_container_annotations,json=defaultContainerAnnotations,proto3" json:"default_container_annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Options) Reset() { *m = Options{} } @@ -238,7 +238,7 @@ func init() { proto.RegisterEnum("containerd.runhcs.v1.Options_DebugType", Options_DebugType_name, Options_DebugType_value) proto.RegisterEnum("containerd.runhcs.v1.Options_SandboxIsolation", Options_SandboxIsolation_name, Options_SandboxIsolation_value) proto.RegisterType((*Options)(nil), "containerd.runhcs.v1.Options") - proto.RegisterMapType((map[string]string)(nil), "containerd.runhcs.v1.Options.GlobalContainerAnnotationsEntry") + proto.RegisterMapType((map[string]string)(nil), "containerd.runhcs.v1.Options.DefaultContainerAnnotationsEntry") proto.RegisterType((*ProcessDetails)(nil), "containerd.runhcs.v1.ProcessDetails") } @@ -247,72 +247,71 @@ func init() { } var fileDescriptor_b643df6839c75082 = []byte{ - // 1028 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xe3, 0x36, - 0x17, 0xb5, 0xf2, 0xb4, 0x6e, 0x5e, 0x0e, 0x27, 0xc0, 0x08, 0xc9, 0x8c, 0x6d, 0x64, 0x3e, 0x60, - 0x32, 0xf8, 0x26, 0x52, 0x92, 0x76, 0x51, 0xf4, 0x81, 0x22, 0xb1, 0x9d, 0x8c, 0x8b, 0x3c, 0x0c, - 0x39, 0xcd, 0xf4, 0xb1, 0x20, 0xf4, 0x60, 0x64, 0x21, 0x92, 0x28, 0x88, 0x94, 0x1b, 0xcf, 0xa6, - 0xfd, 0x09, 0xfd, 0x59, 0x59, 0x76, 0x59, 0xa0, 0x40, 0xda, 0xf1, 0xef, 0xe8, 0xa2, 0x20, 0x45, - 0x39, 0x69, 0x90, 0x4e, 0x17, 0x5d, 0x99, 0x3c, 0xe7, 0xdc, 0xc3, 0xcb, 0x2b, 0xde, 0x6b, 0x38, - 0x0b, 0x42, 0x3e, 0xc8, 0x5d, 0xd3, 0xa3, 0xb1, 0x75, 0x12, 0x7a, 0x19, 0x65, 0xf4, 0x92, 0x5b, - 0x03, 0x8f, 0xb1, 0x41, 0x18, 0x5b, 0x5e, 0xec, 0x5b, 0x1e, 0x4d, 0xb8, 0x13, 0x26, 0x24, 0xf3, - 0xb7, 0x05, 0xb6, 0x9d, 0xe5, 0xc9, 0xc0, 0x63, 0xdb, 0xc3, 0x5d, 0x8b, 0xa6, 0x3c, 0xa4, 0x09, - 0xb3, 0x0a, 0xc4, 0x4c, 0x33, 0xca, 0x29, 0x5a, 0xbb, 0xd3, 0x9b, 0x8a, 0x18, 0xee, 0xae, 0xaf, - 0x05, 0x34, 0xa0, 0x52, 0x60, 0x89, 0x55, 0xa1, 0x5d, 0x6f, 0x04, 0x94, 0x06, 0x11, 0xb1, 0xe4, - 0xce, 0xcd, 0x2f, 0x2d, 0x1e, 0xc6, 0x84, 0x71, 0x27, 0x4e, 0x0b, 0xc1, 0xe6, 0x9f, 0x55, 0x98, - 0x3f, 0x2b, 0x4e, 0x41, 0x6b, 0x30, 0xeb, 0x13, 0x37, 0x0f, 0x0c, 0xad, 0xa9, 0x6d, 0x55, 0xed, - 0x62, 0x83, 0x0e, 0x01, 0xe4, 0x02, 0xf3, 0x51, 0x4a, 0x8c, 0xa9, 0xa6, 0xb6, 0xb5, 0xbc, 0xf7, - 0xd2, 0x7c, 0x2c, 0x07, 0x53, 0x19, 0x99, 0x6d, 0xa1, 0x3f, 0x1f, 0xa5, 0xc4, 0xd6, 0xfd, 0x72, - 0x89, 0x5e, 0xc0, 0x52, 0x46, 0x82, 0x90, 0xf1, 0x6c, 0x84, 0x33, 0x4a, 0xb9, 0x31, 0xdd, 0xd4, - 0xb6, 0x74, 0x7b, 0xb1, 0x04, 0x6d, 0x4a, 0xb9, 0x10, 0x31, 0x27, 0xf1, 0x5d, 0x7a, 0x8d, 0xc3, - 0xd8, 0x09, 0x88, 0x31, 0x53, 0x88, 0x14, 0xd8, 0x15, 0x18, 0x7a, 0x05, 0xb5, 0x52, 0x94, 0x46, - 0x0e, 0xbf, 0xa4, 0x59, 0x6c, 0xcc, 0x4a, 0xdd, 0x8a, 0xc2, 0x7b, 0x0a, 0x46, 0xdf, 0xc3, 0xea, - 0xc4, 0x8f, 0xd1, 0xc8, 0x11, 0xf9, 0x19, 0x73, 0xf2, 0x0e, 0xe6, 0x87, 0xef, 0xd0, 0x57, 0x27, - 0x96, 0x51, 0x76, 0x79, 0xe6, 0x04, 0x41, 0x16, 0xac, 0xb9, 0x94, 0x72, 0x7c, 0x19, 0x46, 0x84, - 0xc9, 0x3b, 0xe1, 0xd4, 0xe1, 0x03, 0x63, 0x5e, 0xe6, 0xb2, 0x2a, 0xb8, 0x43, 0x41, 0x89, 0x9b, - 0xf5, 0x1c, 0x3e, 0x40, 0xaf, 0x01, 0x0d, 0x63, 0x9c, 0x66, 0xd4, 0x23, 0x8c, 0xd1, 0x0c, 0x7b, - 0x34, 0x4f, 0xb8, 0x51, 0x6d, 0x6a, 0x5b, 0xb3, 0x76, 0x6d, 0x18, 0xf7, 0x4a, 0xa2, 0x25, 0x70, - 0x64, 0xc2, 0xda, 0x30, 0xc6, 0x31, 0x89, 0x69, 0x36, 0xc2, 0x2c, 0x7c, 0x47, 0x70, 0x98, 0xe0, - 0xd8, 0x35, 0xf4, 0x52, 0x7f, 0x22, 0xa9, 0x7e, 0xf8, 0x8e, 0x74, 0x93, 0x13, 0x17, 0xd5, 0x01, - 0x8e, 0x7a, 0x5f, 0x5f, 0xbc, 0x69, 0x8b, 0xb3, 0x0c, 0x90, 0x49, 0xdc, 0x43, 0xd0, 0xe7, 0xb0, - 0xc1, 0x3c, 0x27, 0x22, 0xd8, 0x4b, 0x73, 0x1c, 0x85, 0x71, 0xc8, 0x19, 0xe6, 0x14, 0xab, 0x6b, - 0x19, 0x0b, 0xf2, 0xa3, 0x3f, 0x95, 0x92, 0x56, 0x9a, 0x1f, 0x4b, 0xc1, 0x39, 0x55, 0x75, 0x40, - 0x27, 0xf0, 0x3f, 0x9f, 0x5c, 0x3a, 0x79, 0xc4, 0xf1, 0xa4, 0x6e, 0x98, 0x79, 0x99, 0xc3, 0xbd, - 0xc1, 0x24, 0xbb, 0xc0, 0x35, 0x16, 0x65, 0x76, 0x0d, 0xa5, 0x6d, 0x95, 0xd2, 0x7e, 0xa1, 0x2c, - 0x92, 0x3d, 0x72, 0xd1, 0x97, 0xf0, 0xbc, 0xb4, 0x1b, 0xc6, 0x8f, 0xf9, 0x2c, 0x49, 0x1f, 0x43, - 0x89, 0x2e, 0xe2, 0x87, 0x06, 0xe2, 0xa5, 0x0c, 0x9c, 0x8c, 0x94, 0xb1, 0xc6, 0xb2, 0xcc, 0x7f, - 0x51, 0x82, 0x4a, 0x8c, 0x9a, 0xb0, 0x70, 0xda, 0xea, 0x65, 0xf4, 0x7a, 0xb4, 0xef, 0xfb, 0x99, - 0xb1, 0x22, 0x6b, 0x72, 0x1f, 0x42, 0x1b, 0xa0, 0x47, 0x34, 0xc0, 0x11, 0x19, 0x92, 0xc8, 0xa8, - 0x49, 0xbe, 0x1a, 0xd1, 0xe0, 0x58, 0xec, 0xd1, 0xc7, 0xf0, 0x34, 0xa4, 0x38, 0x23, 0xe2, 0xc9, - 0x8a, 0xc6, 0xa1, 0x39, 0x17, 0xd9, 0x31, 0xe2, 0x19, 0xab, 0x32, 0xbd, 0x27, 0x21, 0xb5, 0x05, - 0x7b, 0x5e, 0x90, 0xdd, 0xa4, 0x4f, 0x3c, 0xf4, 0x23, 0x3c, 0x0b, 0x22, 0xea, 0x3a, 0xd1, 0xbd, - 0x42, 0x39, 0x49, 0x42, 0xb9, 0x7c, 0x35, 0xcc, 0x40, 0xcd, 0xe9, 0xad, 0x85, 0xbd, 0x2f, 0x3e, - 0xfc, 0xfc, 0x8e, 0xa4, 0xc3, 0xa4, 0x7c, 0xfb, 0x77, 0xf1, 0x9d, 0x44, 0x34, 0xcb, 0x7a, 0xf0, - 0x8f, 0x82, 0xf5, 0x13, 0x68, 0xfc, 0x4b, 0x38, 0xaa, 0xc1, 0xf4, 0x15, 0x19, 0xc9, 0x46, 0xd7, - 0x6d, 0xb1, 0x14, 0xcd, 0x3f, 0x74, 0xa2, 0xbc, 0xe8, 0x70, 0xdd, 0x2e, 0x36, 0x9f, 0x4e, 0x7d, - 0xa2, 0x6d, 0xbe, 0x02, 0x7d, 0xd2, 0xd0, 0x48, 0x87, 0xd9, 0xd3, 0x5e, 0xb7, 0xd7, 0xa9, 0x55, - 0x50, 0x15, 0x66, 0x0e, 0xbb, 0xc7, 0x9d, 0x9a, 0x86, 0xe6, 0x61, 0xba, 0x73, 0xfe, 0xb6, 0x36, - 0xb5, 0x69, 0x41, 0xed, 0x61, 0xdf, 0xa0, 0x05, 0x98, 0xef, 0xd9, 0x67, 0xad, 0x4e, 0xbf, 0x5f, - 0xab, 0xa0, 0x65, 0x80, 0x37, 0xdf, 0xf6, 0x3a, 0xf6, 0x45, 0xb7, 0x7f, 0x66, 0xd7, 0xb4, 0xcd, - 0xdf, 0xa6, 0x61, 0x59, 0x3d, 0xfb, 0x36, 0xe1, 0x4e, 0x18, 0x31, 0xf4, 0x1c, 0x40, 0xb6, 0x3e, - 0x4e, 0x9c, 0x98, 0xa8, 0x0c, 0x75, 0x89, 0x9c, 0x3a, 0x31, 0x41, 0x2d, 0x00, 0x2f, 0x23, 0x0e, - 0x27, 0x3e, 0x76, 0xb8, 0x4c, 0x76, 0x61, 0x6f, 0xdd, 0x2c, 0xc6, 0x9c, 0x59, 0x8e, 0x39, 0xf3, - 0xbc, 0x1c, 0x73, 0x07, 0xd5, 0x9b, 0xdb, 0x46, 0xe5, 0xe7, 0xdf, 0x1b, 0x9a, 0xad, 0xab, 0xb8, - 0x7d, 0x8e, 0xfe, 0x0f, 0xe8, 0x8a, 0x64, 0x09, 0x89, 0xe4, 0x67, 0xc5, 0xbb, 0x3b, 0x3b, 0x38, - 0x61, 0x72, 0x20, 0xcd, 0xd8, 0x2b, 0x05, 0x23, 0x1c, 0x76, 0x77, 0x76, 0x4e, 0x19, 0x32, 0xe1, - 0x89, 0x6a, 0x42, 0x8f, 0xc6, 0x71, 0xc8, 0xb1, 0x3b, 0xe2, 0x84, 0xc9, 0xc9, 0x34, 0x63, 0xaf, - 0x16, 0x54, 0x4b, 0x32, 0x07, 0x82, 0x40, 0x87, 0xd0, 0x54, 0xfa, 0x1f, 0x68, 0x76, 0x15, 0x26, - 0x01, 0x66, 0x84, 0xe3, 0x34, 0x0b, 0x87, 0x0e, 0x27, 0x2a, 0x78, 0x56, 0x06, 0x3f, 0x2b, 0x74, - 0x6f, 0x0b, 0x59, 0x9f, 0xf0, 0x5e, 0x21, 0x2a, 0x7c, 0xda, 0xd0, 0x78, 0xc4, 0x47, 0xbe, 0x6f, - 0x5f, 0xd9, 0xcc, 0x49, 0x9b, 0x8d, 0x87, 0x36, 0x7d, 0xa9, 0x29, 0x5c, 0x5e, 0x03, 0xa8, 0x81, - 0x83, 0x43, 0x5f, 0x8e, 0xa6, 0xa5, 0x83, 0xa5, 0xf1, 0x6d, 0x43, 0x57, 0x65, 0xef, 0xb6, 0x6d, - 0x5d, 0x09, 0xba, 0x3e, 0x7a, 0x09, 0xb5, 0x9c, 0x91, 0xec, 0x6f, 0x65, 0xa9, 0xca, 0x43, 0x96, - 0x04, 0x7e, 0x57, 0x94, 0x17, 0x30, 0x4f, 0xae, 0x89, 0x27, 0x3c, 0xc5, 0x3c, 0xd2, 0x0f, 0x60, - 0x7c, 0xdb, 0x98, 0xeb, 0x5c, 0x13, 0xaf, 0xdb, 0xb6, 0xe7, 0x04, 0xd5, 0xf5, 0x0f, 0xfc, 0x9b, - 0xf7, 0xf5, 0xca, 0xaf, 0xef, 0xeb, 0x95, 0x9f, 0xc6, 0x75, 0xed, 0x66, 0x5c, 0xd7, 0x7e, 0x19, - 0xd7, 0xb5, 0x3f, 0xc6, 0x75, 0xed, 0xbb, 0xaf, 0xfe, 0xfb, 0x9f, 0xe2, 0x67, 0xea, 0xf7, 0x9b, - 0x8a, 0x3b, 0x27, 0xbf, 0xfb, 0x47, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xf3, 0xdd, 0xed, - 0x6b, 0x07, 0x00, 0x00, + // 1022 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xdb, 0x46, + 0x17, 0x15, 0xfd, 0x14, 0xaf, 0x5f, 0xf4, 0xc4, 0x40, 0x08, 0xfb, 0x8b, 0x24, 0x38, 0x1f, 0x10, + 0x07, 0x8d, 0x49, 0xdb, 0xed, 0xa2, 0x68, 0x8b, 0x16, 0xb6, 0x24, 0x27, 0x2a, 0xfc, 0x10, 0x28, + 0xd7, 0xe9, 0x63, 0x31, 0xe0, 0x63, 0x4c, 0x11, 0x26, 0x39, 0x04, 0x67, 0xa8, 0x5a, 0x59, 0xb5, + 0xfd, 0x05, 0xfd, 0x59, 0x5e, 0x76, 0x59, 0xa0, 0x80, 0xdb, 0xe8, 0x97, 0x14, 0x33, 0x1c, 0xda, + 0x89, 0xe1, 0x36, 0x8b, 0xae, 0x34, 0x73, 0xce, 0x99, 0x33, 0xf7, 0x5e, 0xce, 0xbd, 0x82, 0xd3, + 0x30, 0xe2, 0xc3, 0xc2, 0xb3, 0x7c, 0x9a, 0xd8, 0xc7, 0x91, 0x9f, 0x53, 0x46, 0x2f, 0xb8, 0x3d, + 0xf4, 0x19, 0x1b, 0x46, 0x89, 0xed, 0x27, 0x81, 0xed, 0xd3, 0x94, 0xbb, 0x51, 0x4a, 0xf2, 0x60, + 0x5b, 0x60, 0xdb, 0x79, 0x91, 0x0e, 0x7d, 0xb6, 0x3d, 0xda, 0xb5, 0x69, 0xc6, 0x23, 0x9a, 0x32, + 0xbb, 0x44, 0xac, 0x2c, 0xa7, 0x9c, 0xa2, 0xb5, 0x3b, 0xbd, 0xa5, 0x88, 0xd1, 0xee, 0xfa, 0x5a, + 0x48, 0x43, 0x2a, 0x05, 0xb6, 0x58, 0x95, 0xda, 0xf5, 0x66, 0x48, 0x69, 0x18, 0x13, 0x5b, 0xee, + 0xbc, 0xe2, 0xc2, 0xe6, 0x51, 0x42, 0x18, 0x77, 0x93, 0xac, 0x14, 0x6c, 0xfe, 0xac, 0xc3, 0xfc, + 0x69, 0x79, 0x0b, 0x5a, 0x83, 0xd9, 0x80, 0x78, 0x45, 0x68, 0x6a, 0x2d, 0x6d, 0xab, 0xee, 0x94, + 0x1b, 0x74, 0x08, 0x20, 0x17, 0x98, 0x8f, 0x33, 0x62, 0x4e, 0xb5, 0xb4, 0xad, 0xe5, 0xbd, 0x67, + 0xd6, 0x43, 0x31, 0x58, 0xca, 0xc8, 0xea, 0x08, 0xfd, 0xd9, 0x38, 0x23, 0x8e, 0x1e, 0x54, 0x4b, + 0xf4, 0x14, 0x96, 0x72, 0x12, 0x46, 0x8c, 0xe7, 0x63, 0x9c, 0x53, 0xca, 0xcd, 0xe9, 0x96, 0xb6, + 0xa5, 0x3b, 0x8b, 0x15, 0xe8, 0x50, 0xca, 0x85, 0x88, 0xb9, 0x69, 0xe0, 0xd1, 0x2b, 0x1c, 0x25, + 0x6e, 0x48, 0xcc, 0x99, 0x52, 0xa4, 0xc0, 0x9e, 0xc0, 0xd0, 0x73, 0x30, 0x2a, 0x51, 0x16, 0xbb, + 0xfc, 0x82, 0xe6, 0x89, 0x39, 0x2b, 0x75, 0x2b, 0x0a, 0xef, 0x2b, 0x18, 0xfd, 0x00, 0xab, 0xb7, + 0x7e, 0x8c, 0xc6, 0xae, 0x88, 0xcf, 0x9c, 0x93, 0x39, 0x58, 0xff, 0x9e, 0xc3, 0x40, 0xdd, 0x58, + 0x9d, 0x72, 0xaa, 0x3b, 0x6f, 0x11, 0x64, 0xc3, 0x9a, 0x47, 0x29, 0xc7, 0x17, 0x51, 0x4c, 0x98, + 0xcc, 0x09, 0x67, 0x2e, 0x1f, 0x9a, 0xf3, 0x32, 0x96, 0x55, 0xc1, 0x1d, 0x0a, 0x4a, 0x64, 0xd6, + 0x77, 0xf9, 0x10, 0xbd, 0x00, 0x34, 0x4a, 0x70, 0x96, 0x53, 0x9f, 0x30, 0x46, 0x73, 0xec, 0xd3, + 0x22, 0xe5, 0x66, 0xbd, 0xa5, 0x6d, 0xcd, 0x3a, 0xc6, 0x28, 0xe9, 0x57, 0x44, 0x5b, 0xe0, 0xc8, + 0x82, 0xb5, 0x51, 0x82, 0x13, 0x92, 0xd0, 0x7c, 0x8c, 0x59, 0xf4, 0x86, 0xe0, 0x28, 0xc5, 0x89, + 0x67, 0xea, 0x95, 0xfe, 0x58, 0x52, 0x83, 0xe8, 0x0d, 0xe9, 0xa5, 0xc7, 0x1e, 0x6a, 0x00, 0xbc, + 0xec, 0x7f, 0x73, 0xfe, 0xaa, 0x23, 0xee, 0x32, 0x41, 0x06, 0xf1, 0x0e, 0x82, 0xbe, 0x80, 0x0d, + 0xe6, 0xbb, 0x31, 0xc1, 0x7e, 0x56, 0xe0, 0x38, 0x4a, 0x22, 0xce, 0x30, 0xa7, 0x58, 0xa5, 0x65, + 0x2e, 0xc8, 0x8f, 0xfe, 0x58, 0x4a, 0xda, 0x59, 0x71, 0x24, 0x05, 0x67, 0x54, 0xd5, 0x01, 0x1d, + 0xc3, 0xff, 0x03, 0x72, 0xe1, 0x16, 0x31, 0xc7, 0xb7, 0x75, 0xc3, 0xcc, 0xcf, 0x5d, 0xee, 0x0f, + 0x6f, 0xa3, 0x0b, 0x3d, 0x73, 0x51, 0x46, 0xd7, 0x54, 0xda, 0x76, 0x25, 0x1d, 0x94, 0xca, 0x32, + 0xd8, 0x97, 0x1e, 0xfa, 0x0a, 0x9e, 0x54, 0x76, 0xa3, 0xe4, 0x21, 0x9f, 0x25, 0xe9, 0x63, 0x2a, + 0xd1, 0x79, 0x72, 0xdf, 0x40, 0xbc, 0x94, 0xa1, 0x9b, 0x93, 0xea, 0xac, 0xb9, 0x2c, 0xe3, 0x5f, + 0x94, 0xa0, 0x12, 0xa3, 0x16, 0x2c, 0x9c, 0xb4, 0xfb, 0x39, 0xbd, 0x1a, 0xef, 0x07, 0x41, 0x6e, + 0xae, 0xc8, 0x9a, 0xbc, 0x0b, 0xa1, 0x0d, 0xd0, 0x63, 0x1a, 0xe2, 0x98, 0x8c, 0x48, 0x6c, 0x1a, + 0x92, 0xaf, 0xc7, 0x34, 0x3c, 0x12, 0x7b, 0xf4, 0x09, 0x3c, 0x8e, 0x28, 0xce, 0x89, 0x78, 0xb2, + 0xa2, 0x71, 0x68, 0xc1, 0x45, 0x74, 0x8c, 0xf8, 0xe6, 0xaa, 0x0c, 0xef, 0x51, 0x44, 0x1d, 0xc1, + 0x9e, 0x95, 0x64, 0x2f, 0x1d, 0x10, 0x1f, 0xfd, 0xa2, 0xdd, 0xe5, 0x76, 0x57, 0x2a, 0x37, 0x4d, + 0x29, 0x97, 0xef, 0x86, 0x99, 0xa8, 0x35, 0xbd, 0xb5, 0xb0, 0xf7, 0xe5, 0x87, 0x9a, 0xe8, 0xfd, + 0x0a, 0xee, 0xdf, 0x19, 0x74, 0x53, 0xd1, 0x2f, 0x1b, 0xc1, 0x3f, 0x2b, 0xd6, 0x4f, 0xa0, 0xf5, + 0x21, 0x03, 0x64, 0xc0, 0xf4, 0x25, 0x19, 0xcb, 0x6e, 0xd7, 0x1d, 0xb1, 0x14, 0x13, 0x60, 0xe4, + 0xc6, 0x45, 0xd9, 0xe6, 0xba, 0x53, 0x6e, 0x3e, 0x9b, 0xfa, 0x54, 0xdb, 0x7c, 0x0e, 0xfa, 0x6d, + 0x57, 0x23, 0x1d, 0x66, 0x4f, 0xfa, 0xbd, 0x7e, 0xd7, 0xa8, 0xa1, 0x3a, 0xcc, 0x1c, 0xf6, 0x8e, + 0xba, 0x86, 0x86, 0xe6, 0x61, 0xba, 0x7b, 0xf6, 0xda, 0x98, 0xda, 0xb4, 0xc1, 0xb8, 0xdf, 0x3c, + 0x68, 0x01, 0xe6, 0xfb, 0xce, 0x69, 0xbb, 0x3b, 0x18, 0x18, 0x35, 0xb4, 0x0c, 0xf0, 0xea, 0xbb, + 0x7e, 0xd7, 0x39, 0xef, 0x0d, 0x4e, 0x1d, 0x43, 0xdb, 0xfc, 0x63, 0x1a, 0x96, 0xd5, 0xdb, 0xef, + 0x10, 0xee, 0x46, 0x31, 0x43, 0x4f, 0x00, 0x64, 0xff, 0xe3, 0xd4, 0x4d, 0x88, 0x8a, 0x50, 0x97, + 0xc8, 0x89, 0x9b, 0x10, 0xd4, 0x06, 0xf0, 0x73, 0xe2, 0x72, 0x12, 0x60, 0x97, 0xcb, 0x60, 0x17, + 0xf6, 0xd6, 0xad, 0x72, 0xd6, 0x59, 0xd5, 0xac, 0xb3, 0xce, 0xaa, 0x59, 0x77, 0x50, 0xbf, 0xbe, + 0x69, 0xd6, 0x7e, 0xfd, 0xb3, 0xa9, 0x39, 0xba, 0x3a, 0xb7, 0xcf, 0xd1, 0x47, 0x80, 0x2e, 0x49, + 0x9e, 0x92, 0x58, 0x7e, 0x5b, 0xbc, 0xbb, 0xb3, 0x83, 0x53, 0x26, 0xa7, 0xd2, 0x8c, 0xb3, 0x52, + 0x32, 0xc2, 0x61, 0x77, 0x67, 0xe7, 0x84, 0x21, 0x0b, 0x1e, 0xa9, 0x4e, 0xf4, 0x69, 0x92, 0x44, + 0x1c, 0x7b, 0x63, 0x4e, 0x98, 0x1c, 0x4f, 0x33, 0xce, 0x6a, 0x49, 0xb5, 0x25, 0x73, 0x20, 0x08, + 0x74, 0x08, 0x2d, 0xa5, 0xff, 0x91, 0xe6, 0x97, 0x51, 0x1a, 0x62, 0x46, 0x38, 0xce, 0xf2, 0x68, + 0xe4, 0x72, 0xa2, 0x0e, 0xcf, 0xca, 0xc3, 0xff, 0x2b, 0x75, 0xaf, 0x4b, 0xd9, 0x80, 0xf0, 0x7e, + 0x29, 0x2a, 0x7d, 0x3a, 0xd0, 0x7c, 0xc0, 0x47, 0x3e, 0xf2, 0x40, 0xd9, 0xcc, 0x49, 0x9b, 0x8d, + 0xfb, 0x36, 0x03, 0xa9, 0x29, 0x5d, 0x5e, 0x00, 0xa8, 0xa9, 0x83, 0xa3, 0x40, 0xce, 0xa7, 0xa5, + 0x83, 0xa5, 0xc9, 0x4d, 0x53, 0x57, 0x65, 0xef, 0x75, 0x1c, 0x5d, 0x09, 0x7a, 0x01, 0x7a, 0x06, + 0x46, 0xc1, 0x48, 0xfe, 0x5e, 0x59, 0xea, 0xf2, 0x92, 0x25, 0x81, 0xdf, 0x15, 0xe5, 0x29, 0xcc, + 0x93, 0x2b, 0xe2, 0x0b, 0x4f, 0x31, 0x94, 0xf4, 0x03, 0x98, 0xdc, 0x34, 0xe7, 0xba, 0x57, 0xc4, + 0xef, 0x75, 0x9c, 0x39, 0x41, 0xf5, 0x82, 0x83, 0xe0, 0xfa, 0x6d, 0xa3, 0xf6, 0xfb, 0xdb, 0x46, + 0xed, 0xa7, 0x49, 0x43, 0xbb, 0x9e, 0x34, 0xb4, 0xdf, 0x26, 0x0d, 0xed, 0xaf, 0x49, 0x43, 0xfb, + 0xfe, 0xeb, 0xff, 0xfe, 0xcf, 0xf8, 0xb9, 0xfa, 0xfd, 0xb6, 0xe6, 0xcd, 0xc9, 0xef, 0xfe, 0xf1, + 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x5f, 0x16, 0x8d, 0x70, 0x07, 0x00, 0x00, } func (m *Options) Marshal() (dAtA []byte, err error) { @@ -339,9 +338,9 @@ func (m *Options) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.GlobalContainerAnnotations) > 0 { - for k := range m.GlobalContainerAnnotations { - v := m.GlobalContainerAnnotations[k] + if len(m.DefaultContainerAnnotations) > 0 { + for k := range m.DefaultContainerAnnotations { + v := m.DefaultContainerAnnotations[k] baseI := i i -= len(v) copy(dAtA[i:], v) @@ -635,8 +634,8 @@ func (m *Options) Size() (n int) { if m.IoRetryTimeoutInSec != 0 { n += 2 + sovRunhcs(uint64(m.IoRetryTimeoutInSec)) } - if len(m.GlobalContainerAnnotations) > 0 { - for k, v := range m.GlobalContainerAnnotations { + if len(m.DefaultContainerAnnotations) > 0 { + for k, v := range m.DefaultContainerAnnotations { _ = k _ = v mapEntrySize := 1 + len(k) + sovRunhcs(uint64(len(k))) + 1 + len(v) + sovRunhcs(uint64(len(v))) @@ -699,16 +698,16 @@ func (this *Options) String() string { if this == nil { return "nil" } - keysForGlobalContainerAnnotations := make([]string, 0, len(this.GlobalContainerAnnotations)) - for k, _ := range this.GlobalContainerAnnotations { - keysForGlobalContainerAnnotations = append(keysForGlobalContainerAnnotations, k) + keysForDefaultContainerAnnotations := make([]string, 0, len(this.DefaultContainerAnnotations)) + for k, _ := range this.DefaultContainerAnnotations { + keysForDefaultContainerAnnotations = append(keysForDefaultContainerAnnotations, k) } - github_com_gogo_protobuf_sortkeys.Strings(keysForGlobalContainerAnnotations) - mapStringForGlobalContainerAnnotations := "map[string]string{" - for _, k := range keysForGlobalContainerAnnotations { - mapStringForGlobalContainerAnnotations += fmt.Sprintf("%v: %v,", k, this.GlobalContainerAnnotations[k]) + github_com_gogo_protobuf_sortkeys.Strings(keysForDefaultContainerAnnotations) + mapStringForDefaultContainerAnnotations := "map[string]string{" + for _, k := range keysForDefaultContainerAnnotations { + mapStringForDefaultContainerAnnotations += fmt.Sprintf("%v: %v,", k, this.DefaultContainerAnnotations[k]) } - mapStringForGlobalContainerAnnotations += "}" + mapStringForDefaultContainerAnnotations += "}" s := strings.Join([]string{`&Options{`, `Debug:` + fmt.Sprintf("%v", this.Debug) + `,`, `DebugType:` + fmt.Sprintf("%v", this.DebugType) + `,`, @@ -727,7 +726,7 @@ func (this *Options) String() string { `NCProxyAddr:` + fmt.Sprintf("%v", this.NCProxyAddr) + `,`, `LogLevel:` + fmt.Sprintf("%v", this.LogLevel) + `,`, `IoRetryTimeoutInSec:` + fmt.Sprintf("%v", this.IoRetryTimeoutInSec) + `,`, - `GlobalContainerAnnotations:` + mapStringForGlobalContainerAnnotations + `,`, + `DefaultContainerAnnotations:` + mapStringForDefaultContainerAnnotations + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1208,7 +1207,7 @@ func (m *Options) Unmarshal(dAtA []byte) error { } case 18: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GlobalContainerAnnotations", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DefaultContainerAnnotations", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1235,8 +1234,8 @@ func (m *Options) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.GlobalContainerAnnotations == nil { - m.GlobalContainerAnnotations = make(map[string]string) + if m.DefaultContainerAnnotations == nil { + m.DefaultContainerAnnotations = make(map[string]string) } var mapkey string var mapvalue string @@ -1331,7 +1330,7 @@ func (m *Options) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.GlobalContainerAnnotations[mapkey] = mapvalue + m.DefaultContainerAnnotations[mapkey] = mapvalue iNdEx = postIndex default: iNdEx = preIndex diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.proto b/cmd/containerd-shim-runhcs-v1/options/runhcs.proto index c193e2256c..95b04afeb8 100644 --- a/cmd/containerd-shim-runhcs-v1/options/runhcs.proto +++ b/cmd/containerd-shim-runhcs-v1/options/runhcs.proto @@ -99,8 +99,8 @@ message Options { // timeout. int32 io_retry_timeout_in_sec = 17; - // global_container_annotations specifies a set of annotations that should be set for every workload container - map global_container_annotations = 18; + // default_container_annotations specifies a set of annotations that should be set for every workload container + map default_container_annotations = 18; } // ProcessDetails contains additional information about a process. This is the additional diff --git a/internal/oci/uvm.go b/internal/oci/uvm.go index 3e29b75d50..dc95d94a96 100644 --- a/internal/oci/uvm.go +++ b/internal/oci/uvm.go @@ -395,7 +395,7 @@ func UpdateSpecFromOptions(s specs.Spec, opts *runhcsopts.Options) specs.Spec { s.Annotations[annotations.NetworkConfigProxy] = opts.NCProxyAddr } - for key, value := range opts.GlobalContainerAnnotations { + for key, value := range opts.DefaultContainerAnnotations { // Make sure not to override any annotations which are set explicitly if _, ok := s.Annotations[key]; !ok { s.Annotations[key] = value diff --git a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go index e9e438215e..ff04b224fe 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go +++ b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go @@ -146,11 +146,11 @@ type Options struct { // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite // timeout. IoRetryTimeoutInSec int32 `protobuf:"varint,17,opt,name=io_retry_timeout_in_sec,json=ioRetryTimeoutInSec,proto3" json:"io_retry_timeout_in_sec,omitempty"` - // global_container_annotations specifies a set of annotations that should be set for every workload container - GlobalContainerAnnotations map[string]string `protobuf:"bytes,18,rep,name=global_container_annotations,json=globalContainerAnnotations,proto3" json:"global_container_annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + // default_container_annotations specifies a set of annotations that should be set for every workload container + DefaultContainerAnnotations map[string]string `protobuf:"bytes,18,rep,name=default_container_annotations,json=defaultContainerAnnotations,proto3" json:"default_container_annotations,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Options) Reset() { *m = Options{} } @@ -238,7 +238,7 @@ func init() { proto.RegisterEnum("containerd.runhcs.v1.Options_DebugType", Options_DebugType_name, Options_DebugType_value) proto.RegisterEnum("containerd.runhcs.v1.Options_SandboxIsolation", Options_SandboxIsolation_name, Options_SandboxIsolation_value) proto.RegisterType((*Options)(nil), "containerd.runhcs.v1.Options") - proto.RegisterMapType((map[string]string)(nil), "containerd.runhcs.v1.Options.GlobalContainerAnnotationsEntry") + proto.RegisterMapType((map[string]string)(nil), "containerd.runhcs.v1.Options.DefaultContainerAnnotationsEntry") proto.RegisterType((*ProcessDetails)(nil), "containerd.runhcs.v1.ProcessDetails") } @@ -247,72 +247,71 @@ func init() { } var fileDescriptor_b643df6839c75082 = []byte{ - // 1028 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xe3, 0x36, - 0x17, 0xb5, 0xf2, 0xb4, 0x6e, 0x5e, 0x0e, 0x27, 0xc0, 0x08, 0xc9, 0x8c, 0x6d, 0x64, 0x3e, 0x60, - 0x32, 0xf8, 0x26, 0x52, 0x92, 0x76, 0x51, 0xf4, 0x81, 0x22, 0xb1, 0x9d, 0x8c, 0x8b, 0x3c, 0x0c, - 0x39, 0xcd, 0xf4, 0xb1, 0x20, 0xf4, 0x60, 0x64, 0x21, 0x92, 0x28, 0x88, 0x94, 0x1b, 0xcf, 0xa6, - 0xfd, 0x09, 0xfd, 0x59, 0x59, 0x76, 0x59, 0xa0, 0x40, 0xda, 0xf1, 0xef, 0xe8, 0xa2, 0x20, 0x45, - 0x39, 0x69, 0x90, 0x4e, 0x17, 0x5d, 0x99, 0x3c, 0xe7, 0xdc, 0xc3, 0xcb, 0x2b, 0xde, 0x6b, 0x38, - 0x0b, 0x42, 0x3e, 0xc8, 0x5d, 0xd3, 0xa3, 0xb1, 0x75, 0x12, 0x7a, 0x19, 0x65, 0xf4, 0x92, 0x5b, - 0x03, 0x8f, 0xb1, 0x41, 0x18, 0x5b, 0x5e, 0xec, 0x5b, 0x1e, 0x4d, 0xb8, 0x13, 0x26, 0x24, 0xf3, - 0xb7, 0x05, 0xb6, 0x9d, 0xe5, 0xc9, 0xc0, 0x63, 0xdb, 0xc3, 0x5d, 0x8b, 0xa6, 0x3c, 0xa4, 0x09, - 0xb3, 0x0a, 0xc4, 0x4c, 0x33, 0xca, 0x29, 0x5a, 0xbb, 0xd3, 0x9b, 0x8a, 0x18, 0xee, 0xae, 0xaf, - 0x05, 0x34, 0xa0, 0x52, 0x60, 0x89, 0x55, 0xa1, 0x5d, 0x6f, 0x04, 0x94, 0x06, 0x11, 0xb1, 0xe4, - 0xce, 0xcd, 0x2f, 0x2d, 0x1e, 0xc6, 0x84, 0x71, 0x27, 0x4e, 0x0b, 0xc1, 0xe6, 0x9f, 0x55, 0x98, - 0x3f, 0x2b, 0x4e, 0x41, 0x6b, 0x30, 0xeb, 0x13, 0x37, 0x0f, 0x0c, 0xad, 0xa9, 0x6d, 0x55, 0xed, - 0x62, 0x83, 0x0e, 0x01, 0xe4, 0x02, 0xf3, 0x51, 0x4a, 0x8c, 0xa9, 0xa6, 0xb6, 0xb5, 0xbc, 0xf7, - 0xd2, 0x7c, 0x2c, 0x07, 0x53, 0x19, 0x99, 0x6d, 0xa1, 0x3f, 0x1f, 0xa5, 0xc4, 0xd6, 0xfd, 0x72, - 0x89, 0x5e, 0xc0, 0x52, 0x46, 0x82, 0x90, 0xf1, 0x6c, 0x84, 0x33, 0x4a, 0xb9, 0x31, 0xdd, 0xd4, - 0xb6, 0x74, 0x7b, 0xb1, 0x04, 0x6d, 0x4a, 0xb9, 0x10, 0x31, 0x27, 0xf1, 0x5d, 0x7a, 0x8d, 0xc3, - 0xd8, 0x09, 0x88, 0x31, 0x53, 0x88, 0x14, 0xd8, 0x15, 0x18, 0x7a, 0x05, 0xb5, 0x52, 0x94, 0x46, - 0x0e, 0xbf, 0xa4, 0x59, 0x6c, 0xcc, 0x4a, 0xdd, 0x8a, 0xc2, 0x7b, 0x0a, 0x46, 0xdf, 0xc3, 0xea, - 0xc4, 0x8f, 0xd1, 0xc8, 0x11, 0xf9, 0x19, 0x73, 0xf2, 0x0e, 0xe6, 0x87, 0xef, 0xd0, 0x57, 0x27, - 0x96, 0x51, 0x76, 0x79, 0xe6, 0x04, 0x41, 0x16, 0xac, 0xb9, 0x94, 0x72, 0x7c, 0x19, 0x46, 0x84, - 0xc9, 0x3b, 0xe1, 0xd4, 0xe1, 0x03, 0x63, 0x5e, 0xe6, 0xb2, 0x2a, 0xb8, 0x43, 0x41, 0x89, 0x9b, - 0xf5, 0x1c, 0x3e, 0x40, 0xaf, 0x01, 0x0d, 0x63, 0x9c, 0x66, 0xd4, 0x23, 0x8c, 0xd1, 0x0c, 0x7b, - 0x34, 0x4f, 0xb8, 0x51, 0x6d, 0x6a, 0x5b, 0xb3, 0x76, 0x6d, 0x18, 0xf7, 0x4a, 0xa2, 0x25, 0x70, - 0x64, 0xc2, 0xda, 0x30, 0xc6, 0x31, 0x89, 0x69, 0x36, 0xc2, 0x2c, 0x7c, 0x47, 0x70, 0x98, 0xe0, - 0xd8, 0x35, 0xf4, 0x52, 0x7f, 0x22, 0xa9, 0x7e, 0xf8, 0x8e, 0x74, 0x93, 0x13, 0x17, 0xd5, 0x01, - 0x8e, 0x7a, 0x5f, 0x5f, 0xbc, 0x69, 0x8b, 0xb3, 0x0c, 0x90, 0x49, 0xdc, 0x43, 0xd0, 0xe7, 0xb0, - 0xc1, 0x3c, 0x27, 0x22, 0xd8, 0x4b, 0x73, 0x1c, 0x85, 0x71, 0xc8, 0x19, 0xe6, 0x14, 0xab, 0x6b, - 0x19, 0x0b, 0xf2, 0xa3, 0x3f, 0x95, 0x92, 0x56, 0x9a, 0x1f, 0x4b, 0xc1, 0x39, 0x55, 0x75, 0x40, - 0x27, 0xf0, 0x3f, 0x9f, 0x5c, 0x3a, 0x79, 0xc4, 0xf1, 0xa4, 0x6e, 0x98, 0x79, 0x99, 0xc3, 0xbd, - 0xc1, 0x24, 0xbb, 0xc0, 0x35, 0x16, 0x65, 0x76, 0x0d, 0xa5, 0x6d, 0x95, 0xd2, 0x7e, 0xa1, 0x2c, - 0x92, 0x3d, 0x72, 0xd1, 0x97, 0xf0, 0xbc, 0xb4, 0x1b, 0xc6, 0x8f, 0xf9, 0x2c, 0x49, 0x1f, 0x43, - 0x89, 0x2e, 0xe2, 0x87, 0x06, 0xe2, 0xa5, 0x0c, 0x9c, 0x8c, 0x94, 0xb1, 0xc6, 0xb2, 0xcc, 0x7f, - 0x51, 0x82, 0x4a, 0x8c, 0x9a, 0xb0, 0x70, 0xda, 0xea, 0x65, 0xf4, 0x7a, 0xb4, 0xef, 0xfb, 0x99, - 0xb1, 0x22, 0x6b, 0x72, 0x1f, 0x42, 0x1b, 0xa0, 0x47, 0x34, 0xc0, 0x11, 0x19, 0x92, 0xc8, 0xa8, - 0x49, 0xbe, 0x1a, 0xd1, 0xe0, 0x58, 0xec, 0xd1, 0xc7, 0xf0, 0x34, 0xa4, 0x38, 0x23, 0xe2, 0xc9, - 0x8a, 0xc6, 0xa1, 0x39, 0x17, 0xd9, 0x31, 0xe2, 0x19, 0xab, 0x32, 0xbd, 0x27, 0x21, 0xb5, 0x05, - 0x7b, 0x5e, 0x90, 0xdd, 0xa4, 0x4f, 0x3c, 0xf4, 0x23, 0x3c, 0x0b, 0x22, 0xea, 0x3a, 0xd1, 0xbd, - 0x42, 0x39, 0x49, 0x42, 0xb9, 0x7c, 0x35, 0xcc, 0x40, 0xcd, 0xe9, 0xad, 0x85, 0xbd, 0x2f, 0x3e, - 0xfc, 0xfc, 0x8e, 0xa4, 0xc3, 0xa4, 0x7c, 0xfb, 0x77, 0xf1, 0x9d, 0x44, 0x34, 0xcb, 0x7a, 0xf0, - 0x8f, 0x82, 0xf5, 0x13, 0x68, 0xfc, 0x4b, 0x38, 0xaa, 0xc1, 0xf4, 0x15, 0x19, 0xc9, 0x46, 0xd7, - 0x6d, 0xb1, 0x14, 0xcd, 0x3f, 0x74, 0xa2, 0xbc, 0xe8, 0x70, 0xdd, 0x2e, 0x36, 0x9f, 0x4e, 0x7d, - 0xa2, 0x6d, 0xbe, 0x02, 0x7d, 0xd2, 0xd0, 0x48, 0x87, 0xd9, 0xd3, 0x5e, 0xb7, 0xd7, 0xa9, 0x55, - 0x50, 0x15, 0x66, 0x0e, 0xbb, 0xc7, 0x9d, 0x9a, 0x86, 0xe6, 0x61, 0xba, 0x73, 0xfe, 0xb6, 0x36, - 0xb5, 0x69, 0x41, 0xed, 0x61, 0xdf, 0xa0, 0x05, 0x98, 0xef, 0xd9, 0x67, 0xad, 0x4e, 0xbf, 0x5f, - 0xab, 0xa0, 0x65, 0x80, 0x37, 0xdf, 0xf6, 0x3a, 0xf6, 0x45, 0xb7, 0x7f, 0x66, 0xd7, 0xb4, 0xcd, - 0xdf, 0xa6, 0x61, 0x59, 0x3d, 0xfb, 0x36, 0xe1, 0x4e, 0x18, 0x31, 0xf4, 0x1c, 0x40, 0xb6, 0x3e, - 0x4e, 0x9c, 0x98, 0xa8, 0x0c, 0x75, 0x89, 0x9c, 0x3a, 0x31, 0x41, 0x2d, 0x00, 0x2f, 0x23, 0x0e, - 0x27, 0x3e, 0x76, 0xb8, 0x4c, 0x76, 0x61, 0x6f, 0xdd, 0x2c, 0xc6, 0x9c, 0x59, 0x8e, 0x39, 0xf3, - 0xbc, 0x1c, 0x73, 0x07, 0xd5, 0x9b, 0xdb, 0x46, 0xe5, 0xe7, 0xdf, 0x1b, 0x9a, 0xad, 0xab, 0xb8, - 0x7d, 0x8e, 0xfe, 0x0f, 0xe8, 0x8a, 0x64, 0x09, 0x89, 0xe4, 0x67, 0xc5, 0xbb, 0x3b, 0x3b, 0x38, - 0x61, 0x72, 0x20, 0xcd, 0xd8, 0x2b, 0x05, 0x23, 0x1c, 0x76, 0x77, 0x76, 0x4e, 0x19, 0x32, 0xe1, - 0x89, 0x6a, 0x42, 0x8f, 0xc6, 0x71, 0xc8, 0xb1, 0x3b, 0xe2, 0x84, 0xc9, 0xc9, 0x34, 0x63, 0xaf, - 0x16, 0x54, 0x4b, 0x32, 0x07, 0x82, 0x40, 0x87, 0xd0, 0x54, 0xfa, 0x1f, 0x68, 0x76, 0x15, 0x26, - 0x01, 0x66, 0x84, 0xe3, 0x34, 0x0b, 0x87, 0x0e, 0x27, 0x2a, 0x78, 0x56, 0x06, 0x3f, 0x2b, 0x74, - 0x6f, 0x0b, 0x59, 0x9f, 0xf0, 0x5e, 0x21, 0x2a, 0x7c, 0xda, 0xd0, 0x78, 0xc4, 0x47, 0xbe, 0x6f, - 0x5f, 0xd9, 0xcc, 0x49, 0x9b, 0x8d, 0x87, 0x36, 0x7d, 0xa9, 0x29, 0x5c, 0x5e, 0x03, 0xa8, 0x81, - 0x83, 0x43, 0x5f, 0x8e, 0xa6, 0xa5, 0x83, 0xa5, 0xf1, 0x6d, 0x43, 0x57, 0x65, 0xef, 0xb6, 0x6d, - 0x5d, 0x09, 0xba, 0x3e, 0x7a, 0x09, 0xb5, 0x9c, 0x91, 0xec, 0x6f, 0x65, 0xa9, 0xca, 0x43, 0x96, - 0x04, 0x7e, 0x57, 0x94, 0x17, 0x30, 0x4f, 0xae, 0x89, 0x27, 0x3c, 0xc5, 0x3c, 0xd2, 0x0f, 0x60, - 0x7c, 0xdb, 0x98, 0xeb, 0x5c, 0x13, 0xaf, 0xdb, 0xb6, 0xe7, 0x04, 0xd5, 0xf5, 0x0f, 0xfc, 0x9b, - 0xf7, 0xf5, 0xca, 0xaf, 0xef, 0xeb, 0x95, 0x9f, 0xc6, 0x75, 0xed, 0x66, 0x5c, 0xd7, 0x7e, 0x19, - 0xd7, 0xb5, 0x3f, 0xc6, 0x75, 0xed, 0xbb, 0xaf, 0xfe, 0xfb, 0x9f, 0xe2, 0x67, 0xea, 0xf7, 0x9b, - 0x8a, 0x3b, 0x27, 0xbf, 0xfb, 0x47, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xf3, 0xdd, 0xed, - 0x6b, 0x07, 0x00, 0x00, + // 1022 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4b, 0x6f, 0xdb, 0x46, + 0x17, 0x15, 0xfd, 0x14, 0xaf, 0x5f, 0xf4, 0xc4, 0x40, 0x08, 0xfb, 0x8b, 0x24, 0x38, 0x1f, 0x10, + 0x07, 0x8d, 0x49, 0xdb, 0xed, 0xa2, 0x68, 0x8b, 0x16, 0xb6, 0x24, 0x27, 0x2a, 0xfc, 0x10, 0x28, + 0xd7, 0xe9, 0x63, 0x31, 0xe0, 0x63, 0x4c, 0x11, 0x26, 0x39, 0x04, 0x67, 0xa8, 0x5a, 0x59, 0xb5, + 0xfd, 0x05, 0xfd, 0x59, 0x5e, 0x76, 0x59, 0xa0, 0x80, 0xdb, 0xe8, 0x97, 0x14, 0x33, 0x1c, 0xda, + 0x89, 0xe1, 0x36, 0x8b, 0xae, 0x34, 0x73, 0xce, 0x99, 0x33, 0xf7, 0x5e, 0xce, 0xbd, 0x82, 0xd3, + 0x30, 0xe2, 0xc3, 0xc2, 0xb3, 0x7c, 0x9a, 0xd8, 0xc7, 0x91, 0x9f, 0x53, 0x46, 0x2f, 0xb8, 0x3d, + 0xf4, 0x19, 0x1b, 0x46, 0x89, 0xed, 0x27, 0x81, 0xed, 0xd3, 0x94, 0xbb, 0x51, 0x4a, 0xf2, 0x60, + 0x5b, 0x60, 0xdb, 0x79, 0x91, 0x0e, 0x7d, 0xb6, 0x3d, 0xda, 0xb5, 0x69, 0xc6, 0x23, 0x9a, 0x32, + 0xbb, 0x44, 0xac, 0x2c, 0xa7, 0x9c, 0xa2, 0xb5, 0x3b, 0xbd, 0xa5, 0x88, 0xd1, 0xee, 0xfa, 0x5a, + 0x48, 0x43, 0x2a, 0x05, 0xb6, 0x58, 0x95, 0xda, 0xf5, 0x66, 0x48, 0x69, 0x18, 0x13, 0x5b, 0xee, + 0xbc, 0xe2, 0xc2, 0xe6, 0x51, 0x42, 0x18, 0x77, 0x93, 0xac, 0x14, 0x6c, 0xfe, 0xac, 0xc3, 0xfc, + 0x69, 0x79, 0x0b, 0x5a, 0x83, 0xd9, 0x80, 0x78, 0x45, 0x68, 0x6a, 0x2d, 0x6d, 0xab, 0xee, 0x94, + 0x1b, 0x74, 0x08, 0x20, 0x17, 0x98, 0x8f, 0x33, 0x62, 0x4e, 0xb5, 0xb4, 0xad, 0xe5, 0xbd, 0x67, + 0xd6, 0x43, 0x31, 0x58, 0xca, 0xc8, 0xea, 0x08, 0xfd, 0xd9, 0x38, 0x23, 0x8e, 0x1e, 0x54, 0x4b, + 0xf4, 0x14, 0x96, 0x72, 0x12, 0x46, 0x8c, 0xe7, 0x63, 0x9c, 0x53, 0xca, 0xcd, 0xe9, 0x96, 0xb6, + 0xa5, 0x3b, 0x8b, 0x15, 0xe8, 0x50, 0xca, 0x85, 0x88, 0xb9, 0x69, 0xe0, 0xd1, 0x2b, 0x1c, 0x25, + 0x6e, 0x48, 0xcc, 0x99, 0x52, 0xa4, 0xc0, 0x9e, 0xc0, 0xd0, 0x73, 0x30, 0x2a, 0x51, 0x16, 0xbb, + 0xfc, 0x82, 0xe6, 0x89, 0x39, 0x2b, 0x75, 0x2b, 0x0a, 0xef, 0x2b, 0x18, 0xfd, 0x00, 0xab, 0xb7, + 0x7e, 0x8c, 0xc6, 0xae, 0x88, 0xcf, 0x9c, 0x93, 0x39, 0x58, 0xff, 0x9e, 0xc3, 0x40, 0xdd, 0x58, + 0x9d, 0x72, 0xaa, 0x3b, 0x6f, 0x11, 0x64, 0xc3, 0x9a, 0x47, 0x29, 0xc7, 0x17, 0x51, 0x4c, 0x98, + 0xcc, 0x09, 0x67, 0x2e, 0x1f, 0x9a, 0xf3, 0x32, 0x96, 0x55, 0xc1, 0x1d, 0x0a, 0x4a, 0x64, 0xd6, + 0x77, 0xf9, 0x10, 0xbd, 0x00, 0x34, 0x4a, 0x70, 0x96, 0x53, 0x9f, 0x30, 0x46, 0x73, 0xec, 0xd3, + 0x22, 0xe5, 0x66, 0xbd, 0xa5, 0x6d, 0xcd, 0x3a, 0xc6, 0x28, 0xe9, 0x57, 0x44, 0x5b, 0xe0, 0xc8, + 0x82, 0xb5, 0x51, 0x82, 0x13, 0x92, 0xd0, 0x7c, 0x8c, 0x59, 0xf4, 0x86, 0xe0, 0x28, 0xc5, 0x89, + 0x67, 0xea, 0x95, 0xfe, 0x58, 0x52, 0x83, 0xe8, 0x0d, 0xe9, 0xa5, 0xc7, 0x1e, 0x6a, 0x00, 0xbc, + 0xec, 0x7f, 0x73, 0xfe, 0xaa, 0x23, 0xee, 0x32, 0x41, 0x06, 0xf1, 0x0e, 0x82, 0xbe, 0x80, 0x0d, + 0xe6, 0xbb, 0x31, 0xc1, 0x7e, 0x56, 0xe0, 0x38, 0x4a, 0x22, 0xce, 0x30, 0xa7, 0x58, 0xa5, 0x65, + 0x2e, 0xc8, 0x8f, 0xfe, 0x58, 0x4a, 0xda, 0x59, 0x71, 0x24, 0x05, 0x67, 0x54, 0xd5, 0x01, 0x1d, + 0xc3, 0xff, 0x03, 0x72, 0xe1, 0x16, 0x31, 0xc7, 0xb7, 0x75, 0xc3, 0xcc, 0xcf, 0x5d, 0xee, 0x0f, + 0x6f, 0xa3, 0x0b, 0x3d, 0x73, 0x51, 0x46, 0xd7, 0x54, 0xda, 0x76, 0x25, 0x1d, 0x94, 0xca, 0x32, + 0xd8, 0x97, 0x1e, 0xfa, 0x0a, 0x9e, 0x54, 0x76, 0xa3, 0xe4, 0x21, 0x9f, 0x25, 0xe9, 0x63, 0x2a, + 0xd1, 0x79, 0x72, 0xdf, 0x40, 0xbc, 0x94, 0xa1, 0x9b, 0x93, 0xea, 0xac, 0xb9, 0x2c, 0xe3, 0x5f, + 0x94, 0xa0, 0x12, 0xa3, 0x16, 0x2c, 0x9c, 0xb4, 0xfb, 0x39, 0xbd, 0x1a, 0xef, 0x07, 0x41, 0x6e, + 0xae, 0xc8, 0x9a, 0xbc, 0x0b, 0xa1, 0x0d, 0xd0, 0x63, 0x1a, 0xe2, 0x98, 0x8c, 0x48, 0x6c, 0x1a, + 0x92, 0xaf, 0xc7, 0x34, 0x3c, 0x12, 0x7b, 0xf4, 0x09, 0x3c, 0x8e, 0x28, 0xce, 0x89, 0x78, 0xb2, + 0xa2, 0x71, 0x68, 0xc1, 0x45, 0x74, 0x8c, 0xf8, 0xe6, 0xaa, 0x0c, 0xef, 0x51, 0x44, 0x1d, 0xc1, + 0x9e, 0x95, 0x64, 0x2f, 0x1d, 0x10, 0x1f, 0xfd, 0xa2, 0xdd, 0xe5, 0x76, 0x57, 0x2a, 0x37, 0x4d, + 0x29, 0x97, 0xef, 0x86, 0x99, 0xa8, 0x35, 0xbd, 0xb5, 0xb0, 0xf7, 0xe5, 0x87, 0x9a, 0xe8, 0xfd, + 0x0a, 0xee, 0xdf, 0x19, 0x74, 0x53, 0xd1, 0x2f, 0x1b, 0xc1, 0x3f, 0x2b, 0xd6, 0x4f, 0xa0, 0xf5, + 0x21, 0x03, 0x64, 0xc0, 0xf4, 0x25, 0x19, 0xcb, 0x6e, 0xd7, 0x1d, 0xb1, 0x14, 0x13, 0x60, 0xe4, + 0xc6, 0x45, 0xd9, 0xe6, 0xba, 0x53, 0x6e, 0x3e, 0x9b, 0xfa, 0x54, 0xdb, 0x7c, 0x0e, 0xfa, 0x6d, + 0x57, 0x23, 0x1d, 0x66, 0x4f, 0xfa, 0xbd, 0x7e, 0xd7, 0xa8, 0xa1, 0x3a, 0xcc, 0x1c, 0xf6, 0x8e, + 0xba, 0x86, 0x86, 0xe6, 0x61, 0xba, 0x7b, 0xf6, 0xda, 0x98, 0xda, 0xb4, 0xc1, 0xb8, 0xdf, 0x3c, + 0x68, 0x01, 0xe6, 0xfb, 0xce, 0x69, 0xbb, 0x3b, 0x18, 0x18, 0x35, 0xb4, 0x0c, 0xf0, 0xea, 0xbb, + 0x7e, 0xd7, 0x39, 0xef, 0x0d, 0x4e, 0x1d, 0x43, 0xdb, 0xfc, 0x63, 0x1a, 0x96, 0xd5, 0xdb, 0xef, + 0x10, 0xee, 0x46, 0x31, 0x43, 0x4f, 0x00, 0x64, 0xff, 0xe3, 0xd4, 0x4d, 0x88, 0x8a, 0x50, 0x97, + 0xc8, 0x89, 0x9b, 0x10, 0xd4, 0x06, 0xf0, 0x73, 0xe2, 0x72, 0x12, 0x60, 0x97, 0xcb, 0x60, 0x17, + 0xf6, 0xd6, 0xad, 0x72, 0xd6, 0x59, 0xd5, 0xac, 0xb3, 0xce, 0xaa, 0x59, 0x77, 0x50, 0xbf, 0xbe, + 0x69, 0xd6, 0x7e, 0xfd, 0xb3, 0xa9, 0x39, 0xba, 0x3a, 0xb7, 0xcf, 0xd1, 0x47, 0x80, 0x2e, 0x49, + 0x9e, 0x92, 0x58, 0x7e, 0x5b, 0xbc, 0xbb, 0xb3, 0x83, 0x53, 0x26, 0xa7, 0xd2, 0x8c, 0xb3, 0x52, + 0x32, 0xc2, 0x61, 0x77, 0x67, 0xe7, 0x84, 0x21, 0x0b, 0x1e, 0xa9, 0x4e, 0xf4, 0x69, 0x92, 0x44, + 0x1c, 0x7b, 0x63, 0x4e, 0x98, 0x1c, 0x4f, 0x33, 0xce, 0x6a, 0x49, 0xb5, 0x25, 0x73, 0x20, 0x08, + 0x74, 0x08, 0x2d, 0xa5, 0xff, 0x91, 0xe6, 0x97, 0x51, 0x1a, 0x62, 0x46, 0x38, 0xce, 0xf2, 0x68, + 0xe4, 0x72, 0xa2, 0x0e, 0xcf, 0xca, 0xc3, 0xff, 0x2b, 0x75, 0xaf, 0x4b, 0xd9, 0x80, 0xf0, 0x7e, + 0x29, 0x2a, 0x7d, 0x3a, 0xd0, 0x7c, 0xc0, 0x47, 0x3e, 0xf2, 0x40, 0xd9, 0xcc, 0x49, 0x9b, 0x8d, + 0xfb, 0x36, 0x03, 0xa9, 0x29, 0x5d, 0x5e, 0x00, 0xa8, 0xa9, 0x83, 0xa3, 0x40, 0xce, 0xa7, 0xa5, + 0x83, 0xa5, 0xc9, 0x4d, 0x53, 0x57, 0x65, 0xef, 0x75, 0x1c, 0x5d, 0x09, 0x7a, 0x01, 0x7a, 0x06, + 0x46, 0xc1, 0x48, 0xfe, 0x5e, 0x59, 0xea, 0xf2, 0x92, 0x25, 0x81, 0xdf, 0x15, 0xe5, 0x29, 0xcc, + 0x93, 0x2b, 0xe2, 0x0b, 0x4f, 0x31, 0x94, 0xf4, 0x03, 0x98, 0xdc, 0x34, 0xe7, 0xba, 0x57, 0xc4, + 0xef, 0x75, 0x9c, 0x39, 0x41, 0xf5, 0x82, 0x83, 0xe0, 0xfa, 0x6d, 0xa3, 0xf6, 0xfb, 0xdb, 0x46, + 0xed, 0xa7, 0x49, 0x43, 0xbb, 0x9e, 0x34, 0xb4, 0xdf, 0x26, 0x0d, 0xed, 0xaf, 0x49, 0x43, 0xfb, + 0xfe, 0xeb, 0xff, 0xfe, 0xcf, 0xf8, 0xb9, 0xfa, 0xfd, 0xb6, 0xe6, 0xcd, 0xc9, 0xef, 0xfe, 0xf1, + 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x5f, 0x16, 0x8d, 0x70, 0x07, 0x00, 0x00, } func (m *Options) Marshal() (dAtA []byte, err error) { @@ -339,9 +338,9 @@ func (m *Options) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.GlobalContainerAnnotations) > 0 { - for k := range m.GlobalContainerAnnotations { - v := m.GlobalContainerAnnotations[k] + if len(m.DefaultContainerAnnotations) > 0 { + for k := range m.DefaultContainerAnnotations { + v := m.DefaultContainerAnnotations[k] baseI := i i -= len(v) copy(dAtA[i:], v) @@ -635,8 +634,8 @@ func (m *Options) Size() (n int) { if m.IoRetryTimeoutInSec != 0 { n += 2 + sovRunhcs(uint64(m.IoRetryTimeoutInSec)) } - if len(m.GlobalContainerAnnotations) > 0 { - for k, v := range m.GlobalContainerAnnotations { + if len(m.DefaultContainerAnnotations) > 0 { + for k, v := range m.DefaultContainerAnnotations { _ = k _ = v mapEntrySize := 1 + len(k) + sovRunhcs(uint64(len(k))) + 1 + len(v) + sovRunhcs(uint64(len(v))) @@ -699,16 +698,16 @@ func (this *Options) String() string { if this == nil { return "nil" } - keysForGlobalContainerAnnotations := make([]string, 0, len(this.GlobalContainerAnnotations)) - for k, _ := range this.GlobalContainerAnnotations { - keysForGlobalContainerAnnotations = append(keysForGlobalContainerAnnotations, k) + keysForDefaultContainerAnnotations := make([]string, 0, len(this.DefaultContainerAnnotations)) + for k, _ := range this.DefaultContainerAnnotations { + keysForDefaultContainerAnnotations = append(keysForDefaultContainerAnnotations, k) } - github_com_gogo_protobuf_sortkeys.Strings(keysForGlobalContainerAnnotations) - mapStringForGlobalContainerAnnotations := "map[string]string{" - for _, k := range keysForGlobalContainerAnnotations { - mapStringForGlobalContainerAnnotations += fmt.Sprintf("%v: %v,", k, this.GlobalContainerAnnotations[k]) + github_com_gogo_protobuf_sortkeys.Strings(keysForDefaultContainerAnnotations) + mapStringForDefaultContainerAnnotations := "map[string]string{" + for _, k := range keysForDefaultContainerAnnotations { + mapStringForDefaultContainerAnnotations += fmt.Sprintf("%v: %v,", k, this.DefaultContainerAnnotations[k]) } - mapStringForGlobalContainerAnnotations += "}" + mapStringForDefaultContainerAnnotations += "}" s := strings.Join([]string{`&Options{`, `Debug:` + fmt.Sprintf("%v", this.Debug) + `,`, `DebugType:` + fmt.Sprintf("%v", this.DebugType) + `,`, @@ -727,7 +726,7 @@ func (this *Options) String() string { `NCProxyAddr:` + fmt.Sprintf("%v", this.NCProxyAddr) + `,`, `LogLevel:` + fmt.Sprintf("%v", this.LogLevel) + `,`, `IoRetryTimeoutInSec:` + fmt.Sprintf("%v", this.IoRetryTimeoutInSec) + `,`, - `GlobalContainerAnnotations:` + mapStringForGlobalContainerAnnotations + `,`, + `DefaultContainerAnnotations:` + mapStringForDefaultContainerAnnotations + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1208,7 +1207,7 @@ func (m *Options) Unmarshal(dAtA []byte) error { } case 18: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GlobalContainerAnnotations", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DefaultContainerAnnotations", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1235,8 +1234,8 @@ func (m *Options) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.GlobalContainerAnnotations == nil { - m.GlobalContainerAnnotations = make(map[string]string) + if m.DefaultContainerAnnotations == nil { + m.DefaultContainerAnnotations = make(map[string]string) } var mapkey string var mapvalue string @@ -1331,7 +1330,7 @@ func (m *Options) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.GlobalContainerAnnotations[mapkey] = mapvalue + m.DefaultContainerAnnotations[mapkey] = mapvalue iNdEx = postIndex default: iNdEx = preIndex diff --git a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto index c193e2256c..95b04afeb8 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto +++ b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto @@ -99,8 +99,8 @@ message Options { // timeout. int32 io_retry_timeout_in_sec = 17; - // global_container_annotations specifies a set of annotations that should be set for every workload container - map global_container_annotations = 18; + // default_container_annotations specifies a set of annotations that should be set for every workload container + map default_container_annotations = 18; } // ProcessDetails contains additional information about a process. This is the additional diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go b/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go index 3e29b75d50..dc95d94a96 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go +++ b/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go @@ -395,7 +395,7 @@ func UpdateSpecFromOptions(s specs.Spec, opts *runhcsopts.Options) specs.Spec { s.Annotations[annotations.NetworkConfigProxy] = opts.NCProxyAddr } - for key, value := range opts.GlobalContainerAnnotations { + for key, value := range opts.DefaultContainerAnnotations { // Make sure not to override any annotations which are set explicitly if _, ok := s.Annotations[key]; !ok { s.Annotations[key] = value