diff --git a/api/api.pb.txt b/api/api.pb.txt index bcf490b811..83259e8ede 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -5715,14 +5715,6 @@ file { type_name: ".docker.swarmkit.v1.ContainerSpec.Ulimit" json_name: "ulimits" } - field { - name: "security_opt" - number: 30 - label: LABEL_REPEATED - type: TYPE_MESSAGE - type_name: ".docker.swarmkit.v1.ContainerSpec.SecurityOptEntry" - json_name: "securityOpt" - } nested_type { name: "LabelsEntry" field { @@ -5821,26 +5813,6 @@ file { json_name: "hard" } } - nested_type { - name: "SecurityOptEntry" - field { - name: "key" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "key" - } - field { - name: "value" - number: 2 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "value" - } - options { - map_entry: true - } - } enum_type { name: "Isolation" value { diff --git a/api/specs.pb.go b/api/specs.pb.go index 629dc34421..a789d5a95e 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -875,9 +875,6 @@ type ContainerSpec struct { // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` - // SecurityOpt defines the security options on the container. This option - // is equivalent to passing --security-opt to docker run. - SecurityOpt map[string]string `protobuf:"bytes,30,rep,name=security_opt,json=securityOpt,proto3" json:"security_opt,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *ContainerSpec) Reset() { *m = ContainerSpec{} } @@ -1415,7 +1412,6 @@ func init() { proto.RegisterType((*NetworkAttachmentSpec)(nil), "docker.swarmkit.v1.NetworkAttachmentSpec") proto.RegisterType((*ContainerSpec)(nil), "docker.swarmkit.v1.ContainerSpec") proto.RegisterMapType((map[string]string)(nil), "docker.swarmkit.v1.ContainerSpec.LabelsEntry") - proto.RegisterMapType((map[string]string)(nil), "docker.swarmkit.v1.ContainerSpec.SecurityOptEntry") proto.RegisterMapType((map[string]string)(nil), "docker.swarmkit.v1.ContainerSpec.SysctlsEntry") proto.RegisterType((*ContainerSpec_PullOptions)(nil), "docker.swarmkit.v1.ContainerSpec.PullOptions") proto.RegisterType((*ContainerSpec_DNSConfig)(nil), "docker.swarmkit.v1.ContainerSpec.DNSConfig") @@ -1433,169 +1429,166 @@ func init() { } var fileDescriptor_6589acc608f7d4fd = []byte{ - // 2579 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xc1, 0x73, 0x1b, 0xb7, - 0xd5, 0x17, 0x25, 0x4a, 0x22, 0xdf, 0x52, 0x32, 0x85, 0x38, 0xc9, 0x8a, 0xb6, 0x29, 0x86, 0x71, - 0x1c, 0x25, 0x99, 0x8f, 0x9a, 0xe8, 0xcb, 0xe4, 0x4b, 0x9c, 0x2f, 0x69, 0x29, 0x91, 0xb1, 0x14, - 0xdb, 0x12, 0x07, 0x94, 0xd5, 0x7a, 0xa6, 0x33, 0x1c, 0x68, 0x17, 0x22, 0xb7, 0x5a, 0x2e, 0xb6, - 0x00, 0xa8, 0x84, 0xb7, 0x1e, 0x33, 0xee, 0xa5, 0x87, 0x5e, 0x75, 0xea, 0xf4, 0xd4, 0x4b, 0xfb, - 0x27, 0xf4, 0x96, 0x63, 0x6e, 0x4d, 0x2f, 0x9a, 0x46, 0xf9, 0x13, 0x7a, 0xeb, 0xa5, 0x1d, 0x60, - 0xb1, 0xcb, 0xa5, 0x44, 0x5a, 0xce, 0xd4, 0x87, 0xde, 0x80, 0xb7, 0xbf, 0xdf, 0x5b, 0x3c, 0xe0, - 0xbd, 0x87, 0xf7, 0x76, 0xe1, 0xdd, 0xae, 0x27, 0x7b, 0x83, 0xa3, 0x9a, 0xc3, 0xfa, 0x1b, 0x2e, - 0x73, 0x4e, 0x28, 0xdf, 0x10, 0x5f, 0x12, 0xde, 0x3f, 0xf1, 0xe4, 0x06, 0x09, 0xbd, 0x0d, 0x11, - 0x52, 0x47, 0xd4, 0x42, 0xce, 0x24, 0x43, 0x28, 0x02, 0xd4, 0x62, 0x40, 0xed, 0xf4, 0xfd, 0xd2, - 0x75, 0x7c, 0x39, 0x0c, 0xa9, 0xe1, 0x97, 0x6e, 0x76, 0x59, 0x97, 0xe9, 0xe1, 0x86, 0x1a, 0x19, - 0x69, 0xb9, 0xcb, 0x58, 0xd7, 0xa7, 0x1b, 0x7a, 0x76, 0x34, 0x38, 0xde, 0x70, 0x07, 0x9c, 0x48, - 0x8f, 0x05, 0xe6, 0xf9, 0xea, 0xe5, 0xe7, 0x24, 0x18, 0x4e, 0xa3, 0x7e, 0xc9, 0x49, 0x18, 0x52, - 0x6e, 0x5e, 0x58, 0x3d, 0xcb, 0x42, 0x6e, 0x8f, 0xb9, 0xb4, 0x1d, 0x52, 0x07, 0x3d, 0x00, 0x8b, - 0x04, 0x01, 0x93, 0x5a, 0xb7, 0xb0, 0x33, 0x95, 0xcc, 0xba, 0xb5, 0xb9, 0x56, 0xbb, 0x6a, 0x53, - 0xad, 0x3e, 0x82, 0x6d, 0x65, 0xbf, 0x39, 0x5f, 0x9b, 0xc1, 0x69, 0x26, 0xfa, 0x09, 0x14, 0x5c, - 0x2a, 0x3c, 0x4e, 0xdd, 0x0e, 0x67, 0x3e, 0xb5, 0x67, 0x2b, 0x99, 0xf5, 0xe5, 0xcd, 0xdb, 0x93, - 0x34, 0xa9, 0x97, 0x63, 0xe6, 0x53, 0x6c, 0x19, 0x86, 0x9a, 0xa0, 0x07, 0x00, 0x7d, 0xda, 0x3f, - 0xa2, 0x5c, 0xf4, 0xbc, 0xd0, 0x9e, 0xd3, 0xf4, 0xb7, 0xa7, 0xd1, 0xd5, 0xda, 0x6b, 0x8f, 0x13, - 0x38, 0x4e, 0x51, 0xd1, 0x63, 0x28, 0x90, 0x53, 0xe2, 0xf9, 0xe4, 0xc8, 0xf3, 0x3d, 0x39, 0xb4, - 0xb3, 0x5a, 0xd5, 0x3b, 0xcf, 0x55, 0x55, 0x4f, 0x11, 0xf0, 0x18, 0xbd, 0xea, 0x02, 0x8c, 0x5e, - 0x84, 0xee, 0xc1, 0x62, 0xab, 0xb9, 0xd7, 0xd8, 0xdd, 0x7b, 0x50, 0x9c, 0x29, 0xad, 0x3e, 0x3b, - 0xab, 0xbc, 0xaa, 0x74, 0x8c, 0x00, 0x2d, 0x1a, 0xb8, 0x5e, 0xd0, 0x45, 0xeb, 0x90, 0xab, 0x6f, - 0x6f, 0x37, 0x5b, 0x07, 0xcd, 0x46, 0x31, 0x53, 0x2a, 0x3d, 0x3b, 0xab, 0xbc, 0x36, 0x0e, 0xac, - 0x3b, 0x0e, 0x0d, 0x25, 0x75, 0x4b, 0xd9, 0xaf, 0x7f, 0x5f, 0x9e, 0xa9, 0x7e, 0x9d, 0x81, 0x42, - 0x7a, 0x11, 0xe8, 0x1e, 0x2c, 0xd4, 0xb7, 0x0f, 0x76, 0x0f, 0x9b, 0xc5, 0x99, 0x11, 0x3d, 0x8d, - 0xa8, 0x3b, 0xd2, 0x3b, 0xa5, 0xe8, 0x2e, 0xcc, 0xb7, 0xea, 0x4f, 0xda, 0xcd, 0x62, 0x66, 0xb4, - 0x9c, 0x34, 0xac, 0x45, 0x06, 0x42, 0xa3, 0x1a, 0xb8, 0xbe, 0xbb, 0x57, 0x9c, 0x9d, 0x8c, 0x6a, - 0x70, 0xe2, 0x05, 0x66, 0x29, 0x7f, 0x9c, 0x07, 0xab, 0x4d, 0xf9, 0xa9, 0xe7, 0xbc, 0x64, 0x17, - 0xf9, 0x10, 0xb2, 0x92, 0x88, 0x13, 0xed, 0x1a, 0xd6, 0x64, 0xd7, 0x38, 0x20, 0xe2, 0x44, 0xbd, - 0xd4, 0xd0, 0x35, 0x5e, 0x79, 0x06, 0xa7, 0xa1, 0xef, 0x39, 0x44, 0x52, 0x57, 0x7b, 0x86, 0xb5, - 0xf9, 0xd6, 0x24, 0x36, 0x4e, 0x50, 0x66, 0xfd, 0x3b, 0x33, 0x38, 0x45, 0x45, 0x9f, 0xc0, 0x42, - 0xd7, 0x67, 0x47, 0xc4, 0xd7, 0x3e, 0x61, 0x6d, 0xbe, 0x31, 0x49, 0xc9, 0x03, 0x8d, 0x18, 0x29, - 0x30, 0x14, 0xf4, 0x05, 0x2c, 0x8f, 0x54, 0x75, 0x7e, 0xc9, 0x8e, 0x6c, 0x98, 0xae, 0x64, 0xb4, - 0x92, 0x2f, 0xd8, 0xd1, 0xce, 0x0c, 0x5e, 0xe2, 0x69, 0x01, 0xfa, 0x0c, 0x20, 0xd2, 0xaa, 0xf5, - 0x58, 0x5a, 0xcf, 0x9d, 0xe9, 0x8b, 0x89, 0x74, 0xe4, 0xbb, 0xf1, 0x04, 0x7d, 0x04, 0x0b, 0x83, - 0xd0, 0x25, 0x92, 0xda, 0x0b, 0x9a, 0x5b, 0x99, 0xc4, 0x7d, 0xa2, 0x11, 0xdb, 0x2c, 0x38, 0xf6, - 0xba, 0xd8, 0xe0, 0xd1, 0xff, 0x43, 0x8e, 0x33, 0xdf, 0x3f, 0x22, 0xce, 0x89, 0x9d, 0x7f, 0x41, - 0x6e, 0xc2, 0x40, 0x0f, 0x21, 0x17, 0x50, 0xf9, 0x25, 0xe3, 0x27, 0xc2, 0x5e, 0xac, 0xcc, 0xad, - 0x5b, 0x9b, 0xef, 0x4d, 0x0c, 0xab, 0x08, 0x53, 0x97, 0x92, 0x38, 0xbd, 0x3e, 0x0d, 0x64, 0xa4, - 0x68, 0x6b, 0xd6, 0xce, 0xe0, 0x44, 0x81, 0x5a, 0x0a, 0x0d, 0xdc, 0x90, 0x79, 0x81, 0xb4, 0x73, - 0xd3, 0x97, 0xd2, 0x34, 0x18, 0xe5, 0x16, 0x38, 0x61, 0x6c, 0x2d, 0x40, 0xb6, 0xcf, 0x5c, 0x5a, - 0xdd, 0x80, 0x95, 0x2b, 0xc7, 0x8e, 0x4a, 0x90, 0x33, 0x1b, 0x1e, 0xf9, 0x6b, 0x16, 0x27, 0xf3, - 0xea, 0x0d, 0x58, 0x1a, 0x3b, 0xe2, 0xaa, 0x03, 0x4b, 0x63, 0xc7, 0x85, 0xde, 0x82, 0xe5, 0x3e, - 0xf9, 0xaa, 0xe3, 0xb0, 0xc0, 0x19, 0x70, 0x4e, 0x03, 0x69, 0x74, 0x2c, 0xf5, 0xc9, 0x57, 0xdb, - 0x89, 0x10, 0xbd, 0x07, 0x2b, 0x92, 0x49, 0xe2, 0x77, 0x1c, 0xd6, 0x0f, 0x7d, 0x1a, 0x45, 0xc7, - 0xac, 0x46, 0x16, 0xf5, 0x83, 0xed, 0x91, 0xbc, 0x6a, 0x41, 0x3e, 0x39, 0xcb, 0xea, 0x9f, 0xe6, - 0x21, 0x17, 0x7b, 0x3a, 0x7a, 0x08, 0x40, 0x92, 0x8d, 0x32, 0x1b, 0xf1, 0xce, 0x0b, 0xed, 0xaa, - 0xa2, 0x2b, 0x0f, 0x1f, 0xd1, 0x51, 0x1d, 0xf2, 0x0e, 0x0b, 0x24, 0xf1, 0x02, 0xca, 0x4d, 0xa4, - 0x4e, 0xf4, 0xcf, 0xed, 0x18, 0x64, 0x74, 0x8c, 0x58, 0x68, 0x0b, 0x16, 0xbb, 0x34, 0xa0, 0xdc, - 0x73, 0x8c, 0x83, 0xdf, 0x9b, 0xe8, 0x98, 0x11, 0x04, 0x0f, 0x02, 0xe9, 0xf5, 0xa9, 0xd1, 0x12, - 0x13, 0xd1, 0xe7, 0x90, 0xe7, 0x54, 0xb0, 0x01, 0x77, 0xa8, 0x30, 0xe1, 0xbe, 0x3e, 0x39, 0x4c, - 0x22, 0x10, 0xa6, 0xbf, 0x1a, 0x78, 0x9c, 0x2a, 0x13, 0x04, 0x1e, 0x51, 0xd1, 0x27, 0xb0, 0xc8, - 0xa9, 0x90, 0x84, 0xcb, 0xe7, 0x45, 0x2c, 0x8e, 0x20, 0x2d, 0xe6, 0x7b, 0xce, 0x10, 0xc7, 0x0c, - 0xf4, 0x09, 0xe4, 0x43, 0x9f, 0x38, 0x5a, 0xab, 0x3d, 0x3f, 0x3d, 0xc6, 0x5a, 0x31, 0x08, 0x8f, - 0xf0, 0xe8, 0x63, 0x00, 0x9f, 0x75, 0x3b, 0x2e, 0xf7, 0x4e, 0x29, 0x37, 0x51, 0x56, 0x9a, 0xc4, - 0x6e, 0x68, 0x04, 0xce, 0xfb, 0xac, 0x1b, 0x0d, 0xd1, 0x83, 0xff, 0x28, 0x48, 0x52, 0x01, 0xf2, - 0x06, 0x14, 0x8e, 0x19, 0x77, 0x68, 0xc7, 0xc4, 0x7a, 0x5e, 0xfb, 0x96, 0xa5, 0x65, 0x51, 0x80, - 0xa2, 0x5f, 0xc0, 0x2b, 0xf1, 0x6e, 0x75, 0x38, 0x3d, 0xa6, 0x9c, 0x06, 0x6a, 0xcb, 0x2d, 0xfd, - 0xda, 0xb7, 0x9e, 0xbf, 0xe5, 0x06, 0x6d, 0x52, 0x2d, 0xe2, 0x97, 0x1f, 0x88, 0xad, 0x3c, 0x2c, - 0xf2, 0xe8, 0x80, 0xab, 0xbf, 0xc9, 0xa8, 0x38, 0xbb, 0x84, 0x40, 0x1b, 0x60, 0x25, 0xaf, 0xf7, - 0x5c, 0xed, 0x70, 0xf9, 0xad, 0xe5, 0x8b, 0xf3, 0x35, 0x88, 0xb1, 0xbb, 0x0d, 0x95, 0x81, 0xcd, - 0xd8, 0x45, 0x4d, 0x58, 0x4a, 0x08, 0xaa, 0x08, 0x32, 0x65, 0x42, 0xe5, 0x79, 0x2b, 0x3d, 0x18, - 0x86, 0x14, 0x17, 0x78, 0x6a, 0x56, 0xfd, 0x39, 0xa0, 0xab, 0x0e, 0x88, 0x10, 0x64, 0x4f, 0xbc, - 0xc0, 0x2c, 0x03, 0xeb, 0x31, 0xaa, 0xc1, 0x62, 0x48, 0x86, 0x3e, 0x23, 0xae, 0xf1, 0xc3, 0x9b, - 0xb5, 0xa8, 0x3c, 0xaa, 0xc5, 0xe5, 0x51, 0xad, 0x1e, 0x0c, 0x71, 0x0c, 0xaa, 0x3e, 0x84, 0x57, - 0x27, 0xc6, 0x19, 0xda, 0x84, 0x42, 0x12, 0x23, 0x23, 0x5b, 0x6f, 0x5c, 0x9c, 0xaf, 0x59, 0x49, - 0x30, 0xed, 0x36, 0xb0, 0x95, 0x80, 0x76, 0xdd, 0xea, 0x5f, 0x6f, 0xc0, 0xd2, 0x58, 0xa4, 0xa1, - 0x9b, 0x30, 0xef, 0xf5, 0x49, 0x97, 0x9a, 0x35, 0x46, 0x13, 0xd4, 0x84, 0x05, 0x9f, 0x1c, 0x51, - 0x5f, 0xc5, 0x8a, 0x3a, 0xb8, 0xff, 0xb9, 0x36, 0x64, 0x6b, 0x8f, 0x34, 0xbe, 0x19, 0x48, 0x3e, - 0xc4, 0x86, 0x8c, 0x6c, 0x58, 0x74, 0x58, 0xbf, 0x4f, 0x02, 0x75, 0x49, 0xce, 0xad, 0xe7, 0x71, - 0x3c, 0x55, 0x3b, 0x43, 0x78, 0x57, 0xd8, 0x59, 0x2d, 0xd6, 0x63, 0x95, 0x23, 0x7b, 0x4c, 0xc8, - 0x80, 0xf4, 0xa9, 0xbd, 0xac, 0x57, 0x93, 0xcc, 0x51, 0x11, 0xe6, 0x68, 0x70, 0x6a, 0xcf, 0x6b, - 0xb8, 0x1a, 0x2a, 0x89, 0xeb, 0x45, 0x81, 0x90, 0xc7, 0x6a, 0xa8, 0x74, 0x0e, 0x04, 0xe5, 0xf6, - 0x62, 0xb4, 0xdb, 0x6a, 0x8c, 0x5e, 0x83, 0x85, 0x2e, 0x67, 0x83, 0x30, 0xf2, 0xc0, 0x3c, 0x36, - 0x33, 0x75, 0xdf, 0x85, 0xdc, 0x3b, 0xf5, 0x7c, 0xda, 0xa5, 0xc2, 0x7e, 0x4d, 0x1f, 0x44, 0x79, - 0x62, 0x2c, 0x26, 0x28, 0x9c, 0x62, 0xa0, 0x1a, 0x64, 0xbd, 0xc0, 0x93, 0xf6, 0xeb, 0x26, 0x0e, - 0x2f, 0x1f, 0xe1, 0x16, 0x63, 0xfe, 0x21, 0xf1, 0x07, 0x14, 0x6b, 0x1c, 0x5a, 0x85, 0x39, 0x29, - 0x87, 0xf6, 0x52, 0x25, 0xb3, 0x9e, 0xdb, 0x5a, 0xbc, 0x38, 0x5f, 0x9b, 0x3b, 0x38, 0x78, 0x8a, - 0x95, 0x0c, 0xdd, 0x01, 0x60, 0x21, 0x0d, 0x3a, 0x42, 0xba, 0x5e, 0x60, 0x23, 0x85, 0xc0, 0x79, - 0x25, 0x69, 0x2b, 0x01, 0xba, 0xa5, 0x32, 0x17, 0x71, 0x3b, 0x2c, 0xf0, 0x87, 0xf6, 0x2b, 0xfa, - 0x69, 0x4e, 0x09, 0xf6, 0x03, 0x7f, 0x88, 0xd6, 0xc0, 0x12, 0x92, 0x85, 0x1d, 0xe1, 0x75, 0x03, - 0xe2, 0xdb, 0x37, 0xb5, 0xe5, 0xa0, 0x44, 0x6d, 0x2d, 0x41, 0xff, 0x07, 0x0b, 0x7d, 0x36, 0x08, - 0xa4, 0xb0, 0x73, 0xfa, 0x20, 0x57, 0x27, 0xd9, 0xf8, 0x58, 0x21, 0x4c, 0xd4, 0x19, 0x38, 0x6a, - 0xc2, 0x8a, 0xd6, 0xdc, 0xe5, 0xc4, 0xa1, 0x9d, 0x90, 0x72, 0x8f, 0xb9, 0xe6, 0x7e, 0x5e, 0xbd, - 0x62, 0x6d, 0xc3, 0xb4, 0x02, 0xf8, 0x86, 0xe2, 0x3c, 0x50, 0x94, 0x96, 0x66, 0xa0, 0x16, 0x14, - 0xc2, 0x81, 0xef, 0x77, 0x58, 0x18, 0xdd, 0x46, 0x51, 0x02, 0x7f, 0x01, 0x77, 0x6a, 0x0d, 0x7c, - 0x7f, 0x3f, 0x22, 0x61, 0x2b, 0x1c, 0x4d, 0xd0, 0xa7, 0xb0, 0x28, 0xa8, 0xc3, 0xa9, 0x14, 0x76, - 0x41, 0x9b, 0xf4, 0xe6, 0x24, 0x65, 0x6d, 0x0d, 0x49, 0xf2, 0x02, 0x8e, 0x39, 0x8a, 0xee, 0xe8, - 0xb4, 0x26, 0xec, 0x57, 0xa7, 0xd3, 0x4d, 0xe6, 0x1b, 0xd1, 0x0d, 0x47, 0x85, 0x8b, 0xf2, 0x49, - 0x61, 0xaf, 0x68, 0x77, 0x8a, 0x26, 0xe8, 0x29, 0x80, 0x1b, 0x88, 0x4e, 0x04, 0xb2, 0x6f, 0x68, - 0x1b, 0xdf, 0xbb, 0xde, 0xc6, 0xc6, 0x5e, 0xdb, 0xd4, 0x21, 0x4b, 0x17, 0xe7, 0x6b, 0xf9, 0x64, - 0x8a, 0xf3, 0x6e, 0x20, 0xa2, 0x21, 0xda, 0x02, 0xab, 0x47, 0x89, 0x2f, 0x7b, 0x4e, 0x8f, 0x3a, - 0x27, 0x76, 0x71, 0x7a, 0x59, 0xb2, 0xa3, 0x61, 0x46, 0x43, 0x9a, 0x84, 0x76, 0x21, 0xef, 0x09, - 0xe6, 0xeb, 0x23, 0xb2, 0x6d, 0x9d, 0xdf, 0x5e, 0x60, 0x75, 0xbb, 0x31, 0x05, 0x8f, 0xd8, 0xe8, - 0x36, 0xe4, 0x43, 0xcf, 0x15, 0x8f, 0xbc, 0xbe, 0x27, 0xed, 0xd5, 0x4a, 0x66, 0x7d, 0x0e, 0x8f, - 0x04, 0x68, 0x07, 0x16, 0xc5, 0x50, 0x38, 0xd2, 0x17, 0x76, 0x49, 0x6f, 0x6e, 0xed, 0xfa, 0xd7, - 0xb4, 0x23, 0x42, 0x94, 0x38, 0x62, 0xba, 0xaa, 0x78, 0x1c, 0x12, 0x9a, 0x5e, 0xa0, 0x43, 0x5c, - 0xd7, 0xbe, 0xa5, 0x37, 0x7c, 0x69, 0x24, 0xad, 0xbb, 0x2e, 0x7a, 0x1b, 0x6e, 0xa4, 0x60, 0x2e, - 0x67, 0xa1, 0x7d, 0x5b, 0xe3, 0x52, 0xec, 0x06, 0x67, 0xa1, 0xaa, 0x21, 0x06, 0xbe, 0x5a, 0xa3, - 0xb0, 0xef, 0xe8, 0x95, 0xad, 0x5f, 0xbf, 0xb2, 0x27, 0x9a, 0x80, 0x63, 0x22, 0x7a, 0x02, 0x05, - 0x41, 0x9d, 0x01, 0x57, 0xaf, 0x62, 0xa1, 0xb4, 0xcb, 0x5a, 0xd1, 0xe6, 0x0b, 0x98, 0x68, 0x58, - 0xfb, 0xa1, 0x8c, 0xcc, 0xb4, 0xc4, 0x48, 0x52, 0xfa, 0x18, 0xac, 0x54, 0xee, 0x54, 0x79, 0xed, - 0x84, 0x0e, 0x4d, 0x3a, 0x56, 0x43, 0xe5, 0x73, 0xa7, 0x2a, 0x95, 0xe8, 0xfb, 0x22, 0x8f, 0xa3, - 0xc9, 0xfd, 0xd9, 0x8f, 0x32, 0xa5, 0x4d, 0xb0, 0x52, 0x71, 0x82, 0xde, 0x54, 0x77, 0x59, 0xd7, - 0x13, 0x92, 0x0f, 0x3b, 0x64, 0x20, 0x7b, 0xf6, 0x4f, 0x35, 0xa1, 0x10, 0x0b, 0xeb, 0x03, 0xd9, - 0x2b, 0x75, 0x60, 0xe4, 0x68, 0xa8, 0x02, 0x96, 0x4a, 0xaf, 0x82, 0xf2, 0x53, 0xca, 0x55, 0x65, - 0xaa, 0xf6, 0x2e, 0x2d, 0x52, 0x09, 0x54, 0x50, 0xc2, 0x9d, 0x9e, 0xbe, 0x09, 0xf2, 0xd8, 0xcc, - 0x54, 0x6a, 0x8f, 0x63, 0xda, 0xa4, 0x76, 0x33, 0x2d, 0xdd, 0x87, 0x42, 0xfa, 0x4c, 0x7f, 0x94, - 0x41, 0x0d, 0x58, 0x88, 0x76, 0x5d, 0x25, 0x73, 0x7d, 0x11, 0x98, 0xab, 0x53, 0x5f, 0x02, 0x08, - 0xb2, 0x82, 0x1d, 0x4b, 0x4d, 0x9b, 0xc3, 0x7a, 0xac, 0x64, 0x3d, 0xc2, 0xa3, 0x26, 0x6c, 0x0e, - 0xeb, 0x71, 0xe9, 0x33, 0x28, 0x5e, 0xde, 0xf2, 0x1f, 0xb3, 0x8a, 0xea, 0x9f, 0x33, 0x90, 0x4f, - 0xbc, 0x1f, 0x7d, 0x00, 0x2b, 0xbb, 0xed, 0xfd, 0x47, 0xf5, 0x83, 0xdd, 0xfd, 0xbd, 0x4e, 0xa3, - 0xf9, 0x79, 0xfd, 0xc9, 0xa3, 0x83, 0xe2, 0x4c, 0xe9, 0xce, 0xb3, 0xb3, 0xca, 0xea, 0xe8, 0xa2, - 0x8d, 0xe1, 0x0d, 0x7a, 0x4c, 0x06, 0xbe, 0x1c, 0x67, 0xb5, 0xf0, 0xfe, 0x76, 0xb3, 0xdd, 0x2e, - 0x66, 0xa6, 0xb1, 0x5a, 0x9c, 0x39, 0x54, 0x08, 0xb4, 0x09, 0xc5, 0x11, 0x6b, 0xe7, 0x69, 0xab, - 0x89, 0x0f, 0x8b, 0xb3, 0xa5, 0xdb, 0xcf, 0xce, 0x2a, 0xf6, 0x55, 0xd2, 0xce, 0x30, 0xa4, 0xfc, - 0xd0, 0xf4, 0xc8, 0xff, 0xc8, 0x40, 0x21, 0xdd, 0x98, 0xa0, 0xed, 0xa8, 0x1d, 0xd1, 0x16, 0x2f, - 0x6f, 0x6e, 0x5c, 0xd7, 0xc8, 0xe8, 0xe2, 0xc6, 0x1f, 0x28, 0xbd, 0x8f, 0x99, 0x4b, 0xb1, 0x26, - 0xa3, 0x0f, 0x60, 0x3e, 0x64, 0x5c, 0xc6, 0x65, 0xc0, 0xe4, 0x1b, 0x92, 0xf1, 0xb8, 0x52, 0x8c, - 0xc0, 0xd5, 0x1e, 0x2c, 0x8f, 0x6b, 0x43, 0x77, 0x61, 0xee, 0x70, 0xb7, 0x55, 0x9c, 0x29, 0xdd, - 0x7a, 0x76, 0x56, 0x79, 0x7d, 0xfc, 0xe1, 0xa1, 0xc7, 0xe5, 0x80, 0xf8, 0xbb, 0x2d, 0xf4, 0x2e, - 0xcc, 0x37, 0xf6, 0xda, 0x18, 0x17, 0x33, 0xa5, 0xb5, 0x67, 0x67, 0x95, 0x5b, 0xe3, 0x38, 0xf5, - 0x88, 0x0d, 0x02, 0x17, 0xb3, 0xa3, 0xe4, 0xcb, 0xc0, 0x3f, 0x67, 0xc1, 0x32, 0xd5, 0xd1, 0xcb, - 0xfe, 0x78, 0xb4, 0x14, 0x55, 0xda, 0x71, 0x52, 0x9f, 0xbd, 0xb6, 0xe0, 0x2e, 0x44, 0x04, 0x13, - 0x59, 0x6f, 0x40, 0xc1, 0x0b, 0x4f, 0x3f, 0xec, 0xd0, 0x80, 0x1c, 0xf9, 0xe6, 0x23, 0x41, 0x0e, - 0x5b, 0x4a, 0xd6, 0x8c, 0x44, 0xaa, 0xde, 0xf1, 0x02, 0x49, 0x79, 0x60, 0xda, 0xff, 0x1c, 0x4e, - 0xe6, 0xe8, 0x53, 0xc8, 0x7a, 0x21, 0xe9, 0x9b, 0x2e, 0x61, 0xa2, 0x05, 0xbb, 0xad, 0xfa, 0x63, - 0x13, 0xf9, 0x5b, 0xb9, 0x8b, 0xf3, 0xb5, 0xac, 0x12, 0x60, 0x4d, 0x43, 0xe5, 0xb8, 0x85, 0x53, - 0x6f, 0xd2, 0x35, 0x52, 0x0e, 0xa7, 0x24, 0x2a, 0x7a, 0xbd, 0xa0, 0xcb, 0xa9, 0x10, 0xba, 0x5a, - 0xca, 0xe1, 0x78, 0x8a, 0x4a, 0xb0, 0x68, 0xca, 0x7d, 0xdd, 0xf9, 0xe5, 0x55, 0x13, 0x65, 0x04, - 0x5b, 0x4b, 0x60, 0x45, 0xbb, 0xd1, 0x39, 0xe6, 0xac, 0x5f, 0xfd, 0x57, 0x16, 0xac, 0x6d, 0x7f, - 0x20, 0xa4, 0x29, 0x25, 0x5f, 0xda, 0xe6, 0x3f, 0x85, 0x15, 0xa2, 0x3f, 0x46, 0x91, 0x40, 0xd5, - 0x1e, 0xba, 0x8b, 0x32, 0x07, 0x70, 0x77, 0xa2, 0xba, 0x04, 0x1c, 0x75, 0x5c, 0x5b, 0x0b, 0x4a, - 0xa7, 0x9d, 0xc1, 0x45, 0x72, 0xe9, 0x09, 0x6a, 0xc3, 0x12, 0xe3, 0x4e, 0x8f, 0x0a, 0x19, 0x55, - 0x2c, 0xe6, 0xe3, 0xcd, 0xc4, 0xcf, 0x7a, 0xfb, 0x69, 0xa0, 0xb9, 0xa8, 0xa3, 0xd5, 0x8e, 0xeb, - 0x40, 0x1f, 0x41, 0x96, 0x93, 0xe3, 0xb8, 0x23, 0x9c, 0x18, 0x24, 0x98, 0x1c, 0xcb, 0x31, 0x15, - 0x9a, 0x81, 0xbe, 0x00, 0x70, 0x3d, 0x11, 0x12, 0xe9, 0xf4, 0x28, 0x37, 0x87, 0x3d, 0xd1, 0xc4, - 0x46, 0x82, 0x1a, 0xd3, 0x92, 0x62, 0xa3, 0x87, 0x90, 0x77, 0x48, 0xec, 0xae, 0x0b, 0xd3, 0xbf, - 0x68, 0x6d, 0xd7, 0x8d, 0x8a, 0xa2, 0x52, 0x71, 0x71, 0xbe, 0x96, 0x8b, 0x25, 0x38, 0xe7, 0x10, - 0xe3, 0xbe, 0x0f, 0x61, 0x49, 0x12, 0x71, 0xd2, 0x71, 0xa3, 0x74, 0x16, 0xb9, 0xc9, 0x94, 0xc2, - 0xe3, 0x80, 0x88, 0x13, 0x93, 0xf6, 0xe2, 0xe3, 0x2c, 0xc8, 0x94, 0x0c, 0xfd, 0x0c, 0x56, 0x68, - 0xe0, 0xf0, 0xa1, 0x76, 0xd6, 0x78, 0x85, 0xb9, 0xe9, 0xc6, 0x36, 0x13, 0xf0, 0x98, 0xb1, 0x45, - 0x7a, 0x49, 0x5e, 0xfd, 0x5b, 0x06, 0x20, 0xaa, 0xf4, 0x5e, 0xae, 0x03, 0x22, 0xc8, 0xba, 0x44, - 0x12, 0xed, 0x73, 0x05, 0xac, 0xc7, 0xe8, 0x3e, 0x80, 0xa4, 0xfd, 0x50, 0xa5, 0xde, 0xa0, 0x6b, - 0xdc, 0xe6, 0x79, 0xe9, 0x20, 0x85, 0x46, 0x9b, 0xb0, 0x60, 0xfa, 0xf6, 0xec, 0xb5, 0x3c, 0x83, - 0xac, 0xfe, 0x21, 0x03, 0x10, 0x99, 0xf9, 0x5f, 0x6d, 0x5b, 0xf5, 0x2f, 0xf3, 0x00, 0x87, 0xcc, - 0x1f, 0xf4, 0x5f, 0xf2, 0xb7, 0xd9, 0x9b, 0x30, 0xaf, 0x7b, 0xb5, 0xf8, 0x7a, 0xd6, 0x93, 0xd4, - 0x4e, 0xce, 0xbd, 0xe8, 0x4e, 0xa2, 0x26, 0x58, 0x2a, 0x0f, 0x08, 0xd1, 0xd1, 0x17, 0x62, 0x76, - 0xba, 0xe3, 0x45, 0x76, 0xd4, 0x35, 0x58, 0xdf, 0x82, 0x40, 0x92, 0x31, 0xba, 0x3f, 0x6a, 0x3c, - 0xe6, 0xf5, 0x6d, 0x58, 0x99, 0xae, 0xc2, 0xb4, 0x1f, 0x49, 0xd7, 0x41, 0x61, 0x35, 0xd2, 0xea, - 0x99, 0x2f, 0xfa, 0xa9, 0xcf, 0x4b, 0x26, 0x56, 0x27, 0xa6, 0xa0, 0x03, 0x16, 0x32, 0x9f, 0x75, - 0xd3, 0x78, 0x3c, 0x5d, 0x13, 0xda, 0x89, 0xaa, 0x66, 0x47, 0x55, 0xa8, 0x9c, 0x04, 0x5d, 0x6a, - 0xc2, 0x76, 0xf2, 0x17, 0x37, 0x83, 0xc4, 0x0a, 0x18, 0x15, 0xd6, 0xc9, 0x54, 0xd5, 0xba, 0x63, - 0xbf, 0x2c, 0x72, 0xba, 0x8a, 0x78, 0xff, 0x39, 0x16, 0xab, 0x1a, 0xc2, 0xec, 0xdf, 0xf4, 0x5f, - 0x17, 0xbf, 0xcb, 0x00, 0xba, 0x0a, 0x42, 0xeb, 0xa9, 0x5f, 0x0b, 0xba, 0xd8, 0xb9, 0x8a, 0x31, - 0x3f, 0x17, 0xee, 0x8d, 0x7e, 0x2e, 0xe8, 0x52, 0xe2, 0x2a, 0x30, 0xfa, 0xbd, 0x70, 0x6f, 0xf4, - 0x7b, 0x61, 0x0a, 0x2e, 0xf5, 0x83, 0x61, 0xeb, 0xee, 0x37, 0xdf, 0x97, 0x67, 0xbe, 0xfb, 0xbe, - 0x3c, 0xf3, 0xeb, 0x8b, 0x72, 0xe6, 0x9b, 0x8b, 0x72, 0xe6, 0xdb, 0x8b, 0x72, 0xe6, 0xef, 0x17, - 0xe5, 0xcc, 0x6f, 0x7f, 0x28, 0xcf, 0x7c, 0xfb, 0x43, 0x79, 0xe6, 0xbb, 0x1f, 0xca, 0x33, 0x47, - 0x0b, 0xba, 0xdf, 0xfd, 0xdf, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x7e, 0x54, 0x28, 0x8c, - 0x1b, 0x00, 0x00, + // 2537 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x41, 0x73, 0x1b, 0xb7, + 0x15, 0x26, 0x25, 0x8a, 0x22, 0xdf, 0x92, 0x32, 0x8d, 0x38, 0xc9, 0x8a, 0xb6, 0x29, 0x86, 0x71, + 0x1c, 0x25, 0x99, 0x52, 0x13, 0x35, 0x93, 0x26, 0x4e, 0xd3, 0x96, 0x14, 0x19, 0x8b, 0xb1, 0x2d, + 0x73, 0x40, 0x59, 0xad, 0x67, 0x3a, 0xc3, 0x81, 0x76, 0x21, 0x72, 0xab, 0xe5, 0x62, 0x8b, 0x05, + 0x95, 0xf0, 0xd6, 0x63, 0xc6, 0xbd, 0xf4, 0xd0, 0xab, 0x4e, 0x9d, 0x9e, 0x7a, 0x69, 0xff, 0x41, + 0x7b, 0xcb, 0x31, 0xc7, 0xf4, 0xa2, 0x69, 0x94, 0x9f, 0xd0, 0x5b, 0x2f, 0xed, 0x00, 0x8b, 0x5d, + 0x2e, 0x25, 0xd2, 0x72, 0xa7, 0x3e, 0xf4, 0x06, 0x3c, 0x7e, 0xdf, 0x5b, 0xe0, 0xe1, 0xbd, 0x87, + 0xf7, 0x40, 0x78, 0x77, 0xe0, 0x88, 0xe1, 0xf8, 0xb0, 0x6e, 0xb1, 0xd1, 0x96, 0xcd, 0xac, 0x63, + 0xca, 0xb7, 0x82, 0x2f, 0x08, 0x1f, 0x1d, 0x3b, 0x62, 0x8b, 0xf8, 0xce, 0x56, 0xe0, 0x53, 0x2b, + 0xa8, 0xfb, 0x9c, 0x09, 0x86, 0x50, 0x08, 0xa8, 0x47, 0x80, 0xfa, 0xc9, 0xfb, 0xe5, 0xab, 0xf8, + 0x62, 0xe2, 0x53, 0xcd, 0x2f, 0xdf, 0x18, 0xb0, 0x01, 0x53, 0xc3, 0x2d, 0x39, 0xd2, 0xd2, 0xca, + 0x80, 0xb1, 0x81, 0x4b, 0xb7, 0xd4, 0xec, 0x70, 0x7c, 0xb4, 0x65, 0x8f, 0x39, 0x11, 0x0e, 0xf3, + 0xf4, 0xef, 0xeb, 0x17, 0x7f, 0x27, 0xde, 0x64, 0x11, 0xf5, 0x0b, 0x4e, 0x7c, 0x9f, 0x72, 0xfd, + 0xc1, 0xda, 0x69, 0x06, 0x72, 0x7b, 0xcc, 0xa6, 0x3d, 0x9f, 0x5a, 0xe8, 0x3e, 0x18, 0xc4, 0xf3, + 0x98, 0x50, 0xba, 0x03, 0x33, 0x5d, 0x4d, 0x6f, 0x1a, 0xdb, 0x1b, 0xf5, 0xcb, 0x7b, 0xaa, 0x37, + 0xa6, 0xb0, 0x66, 0xe6, 0xeb, 0xb3, 0x8d, 0x14, 0x4e, 0x32, 0xd1, 0x4f, 0xa1, 0x60, 0xd3, 0xc0, + 0xe1, 0xd4, 0xee, 0x73, 0xe6, 0x52, 0x73, 0xa9, 0x9a, 0xde, 0x5c, 0xdb, 0xbe, 0x35, 0x4f, 0x93, + 0xfc, 0x38, 0x66, 0x2e, 0xc5, 0x86, 0x66, 0xc8, 0x09, 0xba, 0x0f, 0x30, 0xa2, 0xa3, 0x43, 0xca, + 0x83, 0xa1, 0xe3, 0x9b, 0xcb, 0x8a, 0xfe, 0xf6, 0x22, 0xba, 0x5c, 0x7b, 0xfd, 0x51, 0x0c, 0xc7, + 0x09, 0x2a, 0x7a, 0x04, 0x05, 0x72, 0x42, 0x1c, 0x97, 0x1c, 0x3a, 0xae, 0x23, 0x26, 0x66, 0x46, + 0xa9, 0x7a, 0xe7, 0xb9, 0xaa, 0x1a, 0x09, 0x02, 0x9e, 0xa1, 0xd7, 0x6c, 0x80, 0xe9, 0x87, 0xd0, + 0x5d, 0x58, 0xed, 0xb6, 0xf7, 0x5a, 0x9d, 0xbd, 0xfb, 0xa5, 0x54, 0x79, 0xfd, 0xd9, 0x69, 0xf5, + 0x55, 0xa9, 0x63, 0x0a, 0xe8, 0x52, 0xcf, 0x76, 0xbc, 0x01, 0xda, 0x84, 0x5c, 0x63, 0x67, 0xa7, + 0xdd, 0xdd, 0x6f, 0xb7, 0x4a, 0xe9, 0x72, 0xf9, 0xd9, 0x69, 0xf5, 0xb5, 0x59, 0x60, 0xc3, 0xb2, + 0xa8, 0x2f, 0xa8, 0x5d, 0xce, 0x7c, 0xf5, 0x87, 0x4a, 0xaa, 0xf6, 0x55, 0x1a, 0x0a, 0xc9, 0x45, + 0xa0, 0xbb, 0x90, 0x6d, 0xec, 0xec, 0x77, 0x0e, 0xda, 0xa5, 0xd4, 0x94, 0x9e, 0x44, 0x34, 0x2c, + 0xe1, 0x9c, 0x50, 0x74, 0x07, 0x56, 0xba, 0x8d, 0x27, 0xbd, 0x76, 0x29, 0x3d, 0x5d, 0x4e, 0x12, + 0xd6, 0x25, 0xe3, 0x40, 0xa1, 0x5a, 0xb8, 0xd1, 0xd9, 0x2b, 0x2d, 0xcd, 0x47, 0xb5, 0x38, 0x71, + 0x3c, 0xbd, 0x94, 0x3f, 0xad, 0x80, 0xd1, 0xa3, 0xfc, 0xc4, 0xb1, 0x5e, 0xb2, 0x8b, 0x7c, 0x08, + 0x19, 0x41, 0x82, 0x63, 0xe5, 0x1a, 0xc6, 0x7c, 0xd7, 0xd8, 0x27, 0xc1, 0xb1, 0xfc, 0xa8, 0xa6, + 0x2b, 0xbc, 0xf4, 0x0c, 0x4e, 0x7d, 0xd7, 0xb1, 0x88, 0xa0, 0xb6, 0xf2, 0x0c, 0x63, 0xfb, 0xad, + 0x79, 0x6c, 0x1c, 0xa3, 0xf4, 0xfa, 0x77, 0x53, 0x38, 0x41, 0x45, 0x9f, 0x40, 0x76, 0xe0, 0xb2, + 0x43, 0xe2, 0x2a, 0x9f, 0x30, 0xb6, 0xdf, 0x98, 0xa7, 0xe4, 0xbe, 0x42, 0x4c, 0x15, 0x68, 0x0a, + 0xfa, 0x1c, 0xd6, 0xa6, 0xaa, 0xfa, 0xbf, 0x62, 0x87, 0x26, 0x2c, 0x56, 0x32, 0x5d, 0xc9, 0xe7, + 0xec, 0x70, 0x37, 0x85, 0x8b, 0x3c, 0x29, 0x40, 0x3f, 0x01, 0x08, 0xb5, 0x2a, 0x3d, 0x86, 0xd2, + 0x73, 0x7b, 0xf1, 0x62, 0x42, 0x1d, 0xf9, 0x41, 0x34, 0x41, 0x1f, 0x41, 0x76, 0xec, 0xdb, 0x44, + 0x50, 0x33, 0xab, 0xb8, 0xd5, 0x79, 0xdc, 0x27, 0x0a, 0xb1, 0xc3, 0xbc, 0x23, 0x67, 0x80, 0x35, + 0x1e, 0xfd, 0x18, 0x72, 0x9c, 0xb9, 0xee, 0x21, 0xb1, 0x8e, 0xcd, 0xfc, 0x0b, 0x72, 0x63, 0x06, + 0x7a, 0x00, 0x39, 0x8f, 0x8a, 0x2f, 0x18, 0x3f, 0x0e, 0xcc, 0xd5, 0xea, 0xf2, 0xa6, 0xb1, 0xfd, + 0xde, 0xdc, 0xb0, 0x0a, 0x31, 0x0d, 0x21, 0x88, 0x35, 0x1c, 0x51, 0x4f, 0x84, 0x8a, 0x9a, 0x4b, + 0x66, 0x1a, 0xc7, 0x0a, 0xe4, 0x52, 0xa8, 0x67, 0xfb, 0xcc, 0xf1, 0x84, 0x99, 0x5b, 0xbc, 0x94, + 0xb6, 0xc6, 0x48, 0xb7, 0xc0, 0x31, 0xa3, 0x99, 0x85, 0xcc, 0x88, 0xd9, 0xb4, 0xb6, 0x05, 0xd7, + 0x2f, 0x1d, 0x3b, 0x2a, 0x43, 0x4e, 0x1b, 0x3c, 0xf4, 0xd7, 0x0c, 0x8e, 0xe7, 0xb5, 0x6b, 0x50, + 0x9c, 0x39, 0xe2, 0x9a, 0x05, 0xc5, 0x99, 0xe3, 0x42, 0x6f, 0xc1, 0xda, 0x88, 0x7c, 0xd9, 0xb7, + 0x98, 0x67, 0x8d, 0x39, 0xa7, 0x9e, 0xd0, 0x3a, 0x8a, 0x23, 0xf2, 0xe5, 0x4e, 0x2c, 0x44, 0xef, + 0xc1, 0x75, 0xc1, 0x04, 0x71, 0xfb, 0x16, 0x1b, 0xf9, 0x2e, 0x0d, 0xa3, 0x63, 0x49, 0x21, 0x4b, + 0xea, 0x87, 0x9d, 0xa9, 0xbc, 0x66, 0x40, 0x3e, 0x3e, 0xcb, 0xda, 0x9f, 0x57, 0x20, 0x17, 0x79, + 0x3a, 0x7a, 0x00, 0x40, 0x62, 0x43, 0x69, 0x43, 0xbc, 0xf3, 0x42, 0x56, 0x95, 0x74, 0xe9, 0xe1, + 0x53, 0x3a, 0x6a, 0x40, 0xde, 0x62, 0x9e, 0x20, 0x8e, 0x47, 0xb9, 0x8e, 0xd4, 0xb9, 0xfe, 0xb9, + 0x13, 0x81, 0xb4, 0x8e, 0x29, 0x0b, 0x35, 0x61, 0x75, 0x40, 0x3d, 0xca, 0x1d, 0x4b, 0x3b, 0xf8, + 0xdd, 0xb9, 0x8e, 0x19, 0x42, 0xf0, 0xd8, 0x13, 0xce, 0x88, 0x6a, 0x2d, 0x11, 0x11, 0x7d, 0x06, + 0x79, 0x4e, 0x03, 0x36, 0xe6, 0x16, 0x0d, 0x74, 0xb8, 0x6f, 0xce, 0x0f, 0x93, 0x10, 0x84, 0xe9, + 0xaf, 0xc7, 0x0e, 0xa7, 0x72, 0x0b, 0x01, 0x9e, 0x52, 0xd1, 0x27, 0xb0, 0xca, 0x69, 0x20, 0x08, + 0x17, 0xcf, 0x8b, 0x58, 0x1c, 0x42, 0xba, 0xcc, 0x75, 0xac, 0x09, 0x8e, 0x18, 0xe8, 0x13, 0xc8, + 0xfb, 0x2e, 0xb1, 0x94, 0x56, 0x73, 0x65, 0x71, 0x8c, 0x75, 0x23, 0x10, 0x9e, 0xe2, 0xd1, 0xc7, + 0x00, 0x2e, 0x1b, 0xf4, 0x6d, 0xee, 0x9c, 0x50, 0xae, 0xa3, 0xac, 0x3c, 0x8f, 0xdd, 0x52, 0x08, + 0x9c, 0x77, 0xd9, 0x20, 0x1c, 0xa2, 0xfb, 0xff, 0x53, 0x90, 0x24, 0x02, 0xe4, 0x0d, 0x28, 0x1c, + 0x31, 0x6e, 0xd1, 0xbe, 0x8e, 0xf5, 0xbc, 0xf2, 0x2d, 0x43, 0xc9, 0xc2, 0x00, 0x45, 0xbf, 0x84, + 0x57, 0x22, 0x6b, 0xf5, 0x39, 0x3d, 0xa2, 0x9c, 0x7a, 0xd2, 0xe4, 0x86, 0xfa, 0xec, 0x5b, 0xcf, + 0x37, 0xb9, 0x46, 0xeb, 0x54, 0x8b, 0xf8, 0xc5, 0x1f, 0x82, 0x66, 0x1e, 0x56, 0x79, 0x78, 0xc0, + 0xb5, 0xdf, 0xa6, 0x65, 0x9c, 0x5d, 0x40, 0xa0, 0x2d, 0x30, 0xe2, 0xcf, 0x3b, 0xb6, 0x72, 0xb8, + 0x7c, 0x73, 0xed, 0xfc, 0x6c, 0x03, 0x22, 0x6c, 0xa7, 0x25, 0x33, 0xb0, 0x1e, 0xdb, 0xa8, 0x0d, + 0xc5, 0x98, 0x20, 0x8b, 0x20, 0x5d, 0x26, 0x54, 0x9f, 0xb7, 0xd2, 0xfd, 0x89, 0x4f, 0x71, 0x81, + 0x27, 0x66, 0xb5, 0x5f, 0x00, 0xba, 0xec, 0x80, 0x08, 0x41, 0xe6, 0xd8, 0xf1, 0xf4, 0x32, 0xb0, + 0x1a, 0xa3, 0x3a, 0xac, 0xfa, 0x64, 0xe2, 0x32, 0x62, 0x6b, 0x3f, 0xbc, 0x51, 0x0f, 0xcb, 0xa3, + 0x7a, 0x54, 0x1e, 0xd5, 0x1b, 0xde, 0x04, 0x47, 0xa0, 0xda, 0x03, 0x78, 0x75, 0x6e, 0x9c, 0xa1, + 0x6d, 0x28, 0xc4, 0x31, 0x32, 0xdd, 0xeb, 0xb5, 0xf3, 0xb3, 0x0d, 0x23, 0x0e, 0xa6, 0x4e, 0x0b, + 0x1b, 0x31, 0xa8, 0x63, 0xd7, 0xfe, 0xba, 0x06, 0xc5, 0x99, 0x48, 0x43, 0x37, 0x60, 0xc5, 0x19, + 0x91, 0x01, 0xd5, 0x6b, 0x0c, 0x27, 0xa8, 0x0d, 0x59, 0x97, 0x1c, 0x52, 0x57, 0xc6, 0x8a, 0x3c, + 0xb8, 0x1f, 0x5c, 0x19, 0xb2, 0xf5, 0x87, 0x0a, 0xdf, 0xf6, 0x04, 0x9f, 0x60, 0x4d, 0x46, 0x26, + 0xac, 0x5a, 0x6c, 0x34, 0x22, 0x9e, 0xbc, 0x24, 0x97, 0x37, 0xf3, 0x38, 0x9a, 0x4a, 0xcb, 0x10, + 0x3e, 0x08, 0xcc, 0x8c, 0x12, 0xab, 0xb1, 0xcc, 0x91, 0x43, 0x16, 0x08, 0x8f, 0x8c, 0xa8, 0xb9, + 0xa6, 0x56, 0x13, 0xcf, 0x51, 0x09, 0x96, 0xa9, 0x77, 0x62, 0xae, 0x28, 0xb8, 0x1c, 0x4a, 0x89, + 0xed, 0x84, 0x81, 0x90, 0xc7, 0x72, 0x28, 0x75, 0x8e, 0x03, 0xca, 0xcd, 0xd5, 0xd0, 0xda, 0x72, + 0x8c, 0x5e, 0x83, 0xec, 0x80, 0xb3, 0xb1, 0x1f, 0x7a, 0x60, 0x1e, 0xeb, 0x99, 0xbc, 0xef, 0x7c, + 0xee, 0x9c, 0x38, 0x2e, 0x1d, 0xd0, 0xc0, 0x7c, 0x4d, 0x1d, 0x44, 0x65, 0x6e, 0x2c, 0xc6, 0x28, + 0x9c, 0x60, 0xa0, 0x3a, 0x64, 0x1c, 0xcf, 0x11, 0xe6, 0xeb, 0x3a, 0x0e, 0x2f, 0x1e, 0x61, 0x93, + 0x31, 0xf7, 0x80, 0xb8, 0x63, 0x8a, 0x15, 0x0e, 0xad, 0xc3, 0xb2, 0x10, 0x13, 0xb3, 0x58, 0x4d, + 0x6f, 0xe6, 0x9a, 0xab, 0xe7, 0x67, 0x1b, 0xcb, 0xfb, 0xfb, 0x4f, 0xb1, 0x94, 0xa1, 0xdb, 0x00, + 0xcc, 0xa7, 0x5e, 0x3f, 0x10, 0xb6, 0xe3, 0x99, 0x48, 0x22, 0x70, 0x5e, 0x4a, 0x7a, 0x52, 0x80, + 0x6e, 0xca, 0xcc, 0x45, 0xec, 0x3e, 0xf3, 0xdc, 0x89, 0xf9, 0x8a, 0xfa, 0x35, 0x27, 0x05, 0x8f, + 0x3d, 0x77, 0x82, 0x36, 0xc0, 0x08, 0x04, 0xf3, 0xfb, 0x81, 0x33, 0xf0, 0x88, 0x6b, 0xde, 0x50, + 0x3b, 0x07, 0x29, 0xea, 0x29, 0x09, 0xfa, 0x11, 0x64, 0x47, 0x6c, 0xec, 0x89, 0xc0, 0xcc, 0xa9, + 0x83, 0x5c, 0x9f, 0xb7, 0xc7, 0x47, 0x12, 0xa1, 0xa3, 0x4e, 0xc3, 0x51, 0x1b, 0xae, 0x2b, 0xcd, + 0x03, 0x4e, 0x2c, 0xda, 0xf7, 0x29, 0x77, 0x98, 0xad, 0xef, 0xe7, 0xf5, 0x4b, 0xbb, 0x6d, 0xe9, + 0x56, 0x00, 0x5f, 0x93, 0x9c, 0xfb, 0x92, 0xd2, 0x55, 0x0c, 0xd4, 0x85, 0x82, 0x3f, 0x76, 0xdd, + 0x3e, 0xf3, 0xc3, 0xdb, 0x28, 0x4c, 0xe0, 0x2f, 0xe0, 0x4e, 0xdd, 0xb1, 0xeb, 0x3e, 0x0e, 0x49, + 0xd8, 0xf0, 0xa7, 0x13, 0xf4, 0x29, 0xac, 0x06, 0xd4, 0xe2, 0x54, 0x04, 0x66, 0x41, 0x6d, 0xe9, + 0xcd, 0x79, 0xca, 0x7a, 0x0a, 0x12, 0xe7, 0x05, 0x1c, 0x71, 0x24, 0xdd, 0x52, 0x69, 0x2d, 0x30, + 0x5f, 0x5d, 0x4c, 0xd7, 0x99, 0x6f, 0x4a, 0xd7, 0x1c, 0x19, 0x2e, 0xd2, 0x27, 0x03, 0xf3, 0xba, + 0x72, 0xa7, 0x70, 0x82, 0x9e, 0x02, 0xd8, 0x5e, 0xd0, 0x0f, 0x41, 0xe6, 0x35, 0xb5, 0xc7, 0xf7, + 0xae, 0xde, 0x63, 0x6b, 0xaf, 0xa7, 0xeb, 0x90, 0xe2, 0xf9, 0xd9, 0x46, 0x3e, 0x9e, 0xe2, 0xbc, + 0xed, 0x05, 0xe1, 0x10, 0x35, 0xc1, 0x18, 0x52, 0xe2, 0x8a, 0xa1, 0x35, 0xa4, 0xd6, 0xb1, 0x59, + 0x5a, 0x5c, 0x96, 0xec, 0x2a, 0x98, 0xd6, 0x90, 0x24, 0xa1, 0x0e, 0xe4, 0x9d, 0x80, 0xb9, 0xea, + 0x88, 0x4c, 0x53, 0xe5, 0xb7, 0x17, 0x58, 0x5d, 0x27, 0xa2, 0xe0, 0x29, 0x1b, 0xdd, 0x82, 0xbc, + 0xef, 0xd8, 0xc1, 0x43, 0x67, 0xe4, 0x08, 0x73, 0xbd, 0x9a, 0xde, 0x5c, 0xc6, 0x53, 0x01, 0xda, + 0x85, 0xd5, 0x60, 0x12, 0x58, 0xc2, 0x0d, 0xcc, 0xb2, 0x32, 0x6e, 0xfd, 0xea, 0xcf, 0xf4, 0x42, + 0x42, 0x98, 0x38, 0x22, 0xba, 0xac, 0x78, 0x2c, 0xe2, 0xeb, 0x5e, 0xa0, 0x4f, 0x6c, 0xdb, 0xbc, + 0xa9, 0x0c, 0x5e, 0x9c, 0x4a, 0x1b, 0xb6, 0x8d, 0xde, 0x86, 0x6b, 0x09, 0x98, 0xcd, 0x99, 0x6f, + 0xde, 0x52, 0xb8, 0x04, 0xbb, 0xc5, 0x99, 0x2f, 0x6b, 0x88, 0xb1, 0x2b, 0xd7, 0x18, 0x98, 0xb7, + 0xd5, 0xca, 0x36, 0xaf, 0x5e, 0xd9, 0x13, 0x45, 0xc0, 0x11, 0xb1, 0xfc, 0x31, 0x18, 0x89, 0x24, + 0x27, 0x13, 0xd0, 0x31, 0x9d, 0xe8, 0xbc, 0x29, 0x87, 0xd2, 0x39, 0x4e, 0x64, 0xcc, 0xab, 0xc4, + 0x9e, 0xc7, 0xe1, 0xe4, 0xde, 0xd2, 0x47, 0xe9, 0xf2, 0x36, 0x18, 0x09, 0x87, 0x46, 0x6f, 0xca, + 0x4b, 0x67, 0xe0, 0x04, 0x82, 0x4f, 0xfa, 0x64, 0x2c, 0x86, 0xe6, 0xcf, 0x14, 0xa1, 0x10, 0x09, + 0x1b, 0x63, 0x31, 0x2c, 0xf7, 0x61, 0xea, 0x11, 0xa8, 0x0a, 0x86, 0xcc, 0x83, 0x01, 0xe5, 0x27, + 0x94, 0xcb, 0x12, 0x52, 0x6e, 0x32, 0x29, 0x92, 0x99, 0x2e, 0xa0, 0x84, 0x5b, 0x43, 0x95, 0xb2, + 0xf3, 0x58, 0xcf, 0x64, 0x0e, 0x8e, 0x82, 0x4f, 0xe7, 0x60, 0x3d, 0x2d, 0xdf, 0x83, 0x42, 0xd2, + 0xf8, 0xff, 0xd5, 0x86, 0x5a, 0x90, 0x0d, 0xcd, 0x23, 0xb3, 0xae, 0xca, 0xd8, 0xfa, 0x8e, 0x53, + 0xd9, 0x1a, 0x41, 0x26, 0x60, 0x47, 0x42, 0xd1, 0x96, 0xb1, 0x1a, 0x4b, 0xd9, 0x90, 0xf0, 0xb0, + 0x5b, 0x5a, 0xc6, 0x6a, 0x5c, 0xfb, 0x4b, 0x1a, 0xf2, 0xb1, 0x9b, 0xa1, 0x0f, 0xe0, 0x7a, 0xa7, + 0xf7, 0xf8, 0x61, 0x63, 0xbf, 0xf3, 0x78, 0xaf, 0xdf, 0x6a, 0x7f, 0xd6, 0x78, 0xf2, 0x70, 0xbf, + 0x94, 0x2a, 0xdf, 0x7e, 0x76, 0x5a, 0x5d, 0x9f, 0xde, 0x68, 0x11, 0xbc, 0x45, 0x8f, 0xc8, 0xd8, + 0x15, 0xb3, 0xac, 0x2e, 0x7e, 0xbc, 0xd3, 0xee, 0xf5, 0x4a, 0xe9, 0x45, 0xac, 0x2e, 0x67, 0x16, + 0x0d, 0x02, 0xb4, 0x0d, 0xa5, 0x29, 0x6b, 0xf7, 0x69, 0xb7, 0x8d, 0x0f, 0x4a, 0x4b, 0xe5, 0x5b, + 0xcf, 0x4e, 0xab, 0xe6, 0x65, 0xd2, 0xee, 0xc4, 0xa7, 0xfc, 0x40, 0x37, 0xa3, 0xff, 0x4c, 0x43, + 0x21, 0xd9, 0x01, 0xa0, 0x9d, 0xb0, 0xee, 0x57, 0x06, 0x58, 0xdb, 0xde, 0xba, 0xaa, 0x63, 0x50, + 0x55, 0x84, 0x3b, 0x96, 0x7a, 0x1f, 0x31, 0x9b, 0x62, 0x45, 0x46, 0x1f, 0xc0, 0x8a, 0xcf, 0xb8, + 0x88, 0xee, 0xdb, 0xf9, 0x57, 0x11, 0xe3, 0x51, 0x49, 0x16, 0x82, 0x6b, 0x43, 0x58, 0x9b, 0xd5, + 0x86, 0xee, 0xc0, 0xf2, 0x41, 0xa7, 0x5b, 0x4a, 0x95, 0x6f, 0x3e, 0x3b, 0xad, 0xbe, 0x3e, 0xfb, + 0xe3, 0x81, 0xc3, 0xc5, 0x98, 0xb8, 0x9d, 0x2e, 0x7a, 0x17, 0x56, 0x5a, 0x7b, 0x3d, 0x8c, 0x4b, + 0xe9, 0xf2, 0xc6, 0xb3, 0xd3, 0xea, 0xcd, 0x59, 0x9c, 0xfc, 0x89, 0x8d, 0x3d, 0x1b, 0xb3, 0xc3, + 0xb8, 0x05, 0xff, 0xd7, 0x12, 0x18, 0xba, 0x0c, 0x79, 0xd9, 0xaf, 0x34, 0xc5, 0xb0, 0xa4, 0x8d, + 0xb2, 0xe7, 0xd2, 0x95, 0x95, 0x6d, 0x21, 0x24, 0xe8, 0xc8, 0x78, 0x03, 0x0a, 0x8e, 0x7f, 0xf2, + 0x61, 0x9f, 0x7a, 0xe4, 0xd0, 0xd5, 0xdd, 0x78, 0x0e, 0x1b, 0x52, 0xd6, 0x0e, 0x45, 0xb2, 0xb0, + 0x70, 0x3c, 0x41, 0xb9, 0xa7, 0xfb, 0xec, 0x1c, 0x8e, 0xe7, 0xe8, 0x53, 0xc8, 0x38, 0x3e, 0x19, + 0xe9, 0x72, 0x7c, 0xee, 0x0e, 0x3a, 0xdd, 0xc6, 0x23, 0x1d, 0xb9, 0xcd, 0xdc, 0xf9, 0xd9, 0x46, + 0x46, 0x0a, 0xb0, 0xa2, 0xa1, 0x4a, 0xd4, 0x2b, 0xc9, 0x2f, 0xa9, 0x62, 0x24, 0x87, 0x13, 0x12, + 0x19, 0x7d, 0x8e, 0x37, 0xe0, 0x34, 0x08, 0x54, 0x59, 0x92, 0xc3, 0xd1, 0x14, 0x95, 0x61, 0x55, + 0xd7, 0xd5, 0xaa, 0xc5, 0xca, 0xcb, 0x6e, 0x45, 0x0b, 0x9a, 0x45, 0x30, 0x42, 0x6b, 0xf4, 0x8f, + 0x38, 0x1b, 0xd5, 0xfe, 0x9d, 0x01, 0x63, 0xc7, 0x1d, 0x07, 0x42, 0xd7, 0x6c, 0x2f, 0xcd, 0xf8, + 0x4f, 0xe1, 0x3a, 0x51, 0xaf, 0x3e, 0xc4, 0x93, 0x97, 0xbc, 0x6a, 0x57, 0xf4, 0x01, 0xdc, 0x99, + 0xab, 0x2e, 0x06, 0x87, 0xad, 0x4d, 0x33, 0x2b, 0x75, 0x9a, 0x69, 0x5c, 0x22, 0x17, 0x7e, 0x41, + 0x3d, 0x28, 0x32, 0x6e, 0x0d, 0x69, 0x20, 0xc2, 0xd2, 0x40, 0xbf, 0x92, 0xcc, 0x7d, 0x3f, 0x7b, + 0x9c, 0x04, 0xea, 0x1b, 0x31, 0x5c, 0xed, 0xac, 0x0e, 0xf4, 0x11, 0x64, 0x38, 0x39, 0x8a, 0x5a, + 0xaf, 0xb9, 0x41, 0x82, 0xc9, 0x91, 0x98, 0x51, 0xa1, 0x18, 0xe8, 0x73, 0x00, 0xdb, 0x09, 0x7c, + 0x22, 0xac, 0x21, 0xe5, 0xfa, 0xb0, 0xe7, 0x6e, 0xb1, 0x15, 0xa3, 0x66, 0xb4, 0x24, 0xd8, 0xe8, + 0x01, 0xe4, 0x2d, 0x12, 0xb9, 0x6b, 0x76, 0xf1, 0xd3, 0xd1, 0x4e, 0x43, 0xab, 0x28, 0x49, 0x15, + 0xe7, 0x67, 0x1b, 0xb9, 0x48, 0x82, 0x73, 0x16, 0xd1, 0xee, 0xfb, 0x00, 0x8a, 0x82, 0x04, 0xc7, + 0x7d, 0x3b, 0x4c, 0x67, 0xa1, 0x9b, 0x2c, 0xb8, 0xe1, 0x65, 0x87, 0xae, 0xd3, 0x5e, 0x74, 0x9c, + 0x05, 0x91, 0x90, 0xa1, 0x9f, 0xc3, 0x75, 0xea, 0x59, 0x7c, 0xa2, 0x9c, 0x35, 0x5a, 0x61, 0x6e, + 0xf1, 0x66, 0xdb, 0x31, 0x78, 0x66, 0xb3, 0x25, 0x7a, 0x41, 0x5e, 0xfb, 0x7b, 0x1a, 0x20, 0x2c, + 0xa9, 0x5e, 0xae, 0x03, 0x22, 0xc8, 0xd8, 0x44, 0x10, 0xe5, 0x73, 0x05, 0xac, 0xc6, 0xe8, 0x1e, + 0x80, 0xa0, 0x23, 0x5f, 0xa6, 0x5e, 0x6f, 0xa0, 0xdd, 0xe6, 0x79, 0xe9, 0x20, 0x81, 0x46, 0xdb, + 0x90, 0xd5, 0x0d, 0x72, 0xe6, 0x4a, 0x9e, 0x46, 0xd6, 0xfe, 0x98, 0x06, 0x08, 0xb7, 0xf9, 0x7f, + 0xbd, 0xb7, 0xda, 0xdf, 0x56, 0x00, 0x0e, 0x98, 0x3b, 0x1e, 0xbd, 0xe4, 0x47, 0xd0, 0x1b, 0xb0, + 0xa2, 0x9a, 0xa2, 0xe8, 0x92, 0x57, 0x93, 0x84, 0x25, 0x97, 0x5f, 0xd4, 0x92, 0xa8, 0x0d, 0x86, + 0xcc, 0x03, 0x41, 0xd0, 0x57, 0x17, 0x62, 0x66, 0xb1, 0xe3, 0x85, 0xfb, 0x68, 0x28, 0xb0, 0xba, + 0x05, 0x81, 0xc4, 0x63, 0x74, 0x6f, 0x5a, 0xe1, 0xaf, 0xa8, 0xdb, 0xb0, 0xba, 0x58, 0x85, 0xae, + 0xf3, 0xe3, 0xf2, 0x9e, 0xc2, 0x7a, 0xa8, 0xd5, 0xd1, 0x4f, 0xe7, 0x89, 0x77, 0x1c, 0x1d, 0xab, + 0x73, 0x53, 0xd0, 0x3e, 0xf3, 0x99, 0xcb, 0x06, 0x49, 0x3c, 0x5e, 0xac, 0x09, 0xed, 0x86, 0xe5, + 0xa9, 0x25, 0xab, 0x4e, 0x4e, 0xbc, 0x01, 0xd5, 0x61, 0x3b, 0xff, 0x69, 0x4b, 0x23, 0xb1, 0x04, + 0x86, 0x15, 0x6c, 0x3c, 0x45, 0x4f, 0x2e, 0xfc, 0x37, 0x90, 0x53, 0x55, 0xc4, 0xfb, 0xcf, 0xd9, + 0xb1, 0xac, 0x21, 0xb4, 0xfd, 0x16, 0xff, 0x47, 0xf0, 0xfb, 0x34, 0xa0, 0xcb, 0x20, 0xb4, 0x99, + 0x78, 0xc3, 0x57, 0xc5, 0xce, 0x65, 0x8c, 0x7e, 0xc5, 0xbf, 0x3b, 0x7d, 0xc5, 0x57, 0xa5, 0xc4, + 0x65, 0x60, 0xf8, 0x8e, 0x7f, 0x77, 0xfa, 0x8e, 0xbf, 0x00, 0x97, 0x78, 0xc9, 0x6f, 0xde, 0xf9, + 0xfa, 0xbb, 0x4a, 0xea, 0xdb, 0xef, 0x2a, 0xa9, 0xdf, 0x9c, 0x57, 0xd2, 0x5f, 0x9f, 0x57, 0xd2, + 0xdf, 0x9c, 0x57, 0xd2, 0xff, 0x38, 0xaf, 0xa4, 0x7f, 0xf7, 0x7d, 0x25, 0xf5, 0xcd, 0xf7, 0x95, + 0xd4, 0xb7, 0xdf, 0x57, 0x52, 0x87, 0x59, 0xd5, 0x58, 0xfe, 0xf0, 0x3f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xd2, 0x36, 0x0b, 0x87, 0xf5, 0x1a, 0x00, 0x00, } func (m *NodeSpec) Copy() *NodeSpec { @@ -1965,13 +1958,6 @@ func (m *ContainerSpec) CopyFrom(src interface{}) { } } - if o.SecurityOpt != nil { - m.SecurityOpt = make(map[string]string, len(o.SecurityOpt)) - for k, v := range o.SecurityOpt { - m.SecurityOpt[k] = v - } - } - } func (m *ContainerSpec_PullOptions) Copy() *ContainerSpec_PullOptions { @@ -2850,27 +2836,6 @@ func (m *ContainerSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.SecurityOpt) > 0 { - for k := range m.SecurityOpt { - v := m.SecurityOpt[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintSpecs(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintSpecs(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintSpecs(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xf2 - } - } if len(m.Ulimits) > 0 { for iNdEx := len(m.Ulimits) - 1; iNdEx >= 0; iNdEx-- { { @@ -4246,14 +4211,6 @@ func (m *ContainerSpec) Size() (n int) { n += 2 + l + sovSpecs(uint64(l)) } } - if len(m.SecurityOpt) > 0 { - for k, v := range m.SecurityOpt { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovSpecs(uint64(len(k))) + 1 + len(v) + sovSpecs(uint64(len(v))) - n += mapEntrySize + 2 + sovSpecs(uint64(mapEntrySize)) - } - } return n } @@ -4737,16 +4694,6 @@ func (this *ContainerSpec) String() string { mapStringForSysctls += fmt.Sprintf("%v: %v,", k, this.Sysctls[k]) } mapStringForSysctls += "}" - keysForSecurityOpt := make([]string, 0, len(this.SecurityOpt)) - for k, _ := range this.SecurityOpt { - keysForSecurityOpt = append(keysForSecurityOpt, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForSecurityOpt) - mapStringForSecurityOpt := "map[string]string{" - for _, k := range keysForSecurityOpt { - mapStringForSecurityOpt += fmt.Sprintf("%v: %v,", k, this.SecurityOpt[k]) - } - mapStringForSecurityOpt += "}" s := strings.Join([]string{`&ContainerSpec{`, `Image:` + fmt.Sprintf("%v", this.Image) + `,`, `Labels:` + mapStringForLabels + `,`, @@ -4777,7 +4724,6 @@ func (this *ContainerSpec) String() string { `CapabilityAdd:` + fmt.Sprintf("%v", this.CapabilityAdd) + `,`, `CapabilityDrop:` + fmt.Sprintf("%v", this.CapabilityDrop) + `,`, `Ulimits:` + repeatedStringForUlimits + `,`, - `SecurityOpt:` + mapStringForSecurityOpt + `,`, `}`, }, "") return s @@ -7530,133 +7476,6 @@ func (m *ContainerSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 30: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SecurityOpt", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSpecs - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSpecs - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSpecs - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.SecurityOpt == nil { - m.SecurityOpt = 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 ErrIntOverflowSpecs - } - 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 ErrIntOverflowSpecs - } - 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 ErrInvalidLengthSpecs - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthSpecs - } - 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 ErrIntOverflowSpecs - } - 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 ErrInvalidLengthSpecs - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthSpecs - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipSpecs(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSpecs - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.SecurityOpt[mapkey] = mapvalue - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipSpecs(dAtA[iNdEx:]) diff --git a/api/specs.proto b/api/specs.proto index a0e21972b8..a097b2be3c 100644 --- a/api/specs.proto +++ b/api/specs.proto @@ -370,10 +370,6 @@ message ContainerSpec { // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. repeated Ulimit ulimits = 29; - - // SecurityOpt defines the security options on the container. This option - // is equivalent to passing --security-opt to docker run. - map security_opt = 30; } // EndpointSpec defines the properties that can be configured to