From 7db07d0186f7485a736771ce412b9eb71eb4a967 Mon Sep 17 00:00:00 2001 From: Olli Janatuinen Date: Tue, 2 Aug 2022 17:04:14 +0000 Subject: [PATCH 1/2] Add privileged option to ContainerSpec Signed-off-by: Olli Janatuinen --- api/api.pb.txt | 27 +- api/specs.pb.go | 351 ++++++++++-------- api/specs.proto | 3 + .../plugin/deepcopy/test/deepcopypb_test.go | 163 ++++---- 4 files changed, 297 insertions(+), 247 deletions(-) diff --git a/api/api.pb.txt b/api/api.pb.txt index 90ed599171..bda1b0c9bb 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -2735,8 +2735,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65001: 0 65003: "os.FileMode" + 65001: 0 } json_name: "mode" } @@ -2904,8 +2904,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65001: 0 65011: 1 + 65001: 0 } json_name: "delay" } @@ -3348,8 +3348,8 @@ file { } } options { - 62001: 0 62023: "PublishMode" + 62001: 0 } } } @@ -4055,8 +4055,8 @@ file { label: LABEL_OPTIONAL type: TYPE_UINT32 options { - 65001: 0 65003: "os.FileMode" + 65001: 0 } json_name: "mode" } @@ -5052,8 +5052,8 @@ file { } } options { - 62001: 0 62023: "NodeRole" + 62001: 0 } } syntax: "proto3" @@ -5677,6 +5677,13 @@ file { type_name: ".docker.swarmkit.v1.ContainerSpec.Ulimit" json_name: "ulimits" } + field { + name: "privileged" + number: 30 + label: LABEL_OPTIONAL + type: TYPE_BOOL + json_name: "privileged" + } nested_type { name: "LabelsEntry" field { @@ -9739,8 +9746,8 @@ file { type: TYPE_MESSAGE type_name: ".google.protobuf.Duration" options { - 65001: 0 65011: 1 + 65001: 0 } json_name: "period" } @@ -10958,14 +10965,14 @@ file { } } options { - 63001: 0 - 63002: 0 63017: 1 - 63018: 1 63020: 1 + 63018: 1 + 63001: 0 + 63002: 0 + 63035: 0 63026: 0 63034: 0 - 63035: 0 } } file { diff --git a/api/specs.pb.go b/api/specs.pb.go index a789d5a95e..f381b6ac49 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -875,6 +875,8 @@ 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"` + // Privileged give extended privileges to the container + Privileged bool `protobuf:"varint,30,opt,name=privileged,proto3" json:"privileged,omitempty"` } func (m *ContainerSpec) Reset() { *m = ContainerSpec{} } @@ -1429,166 +1431,167 @@ func init() { } var fileDescriptor_6589acc608f7d4fd = []byte{ - // 2537 bytes of a gzipped FileDescriptorProto + // 2547 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, + 0x95, 0xf0, 0xd6, 0x63, 0xc6, 0xbd, 0xf4, 0xd0, 0xab, 0x4e, 0x9d, 0x9e, 0x7a, 0x69, 0x7f, 0x42, + 0x6f, 0x39, 0xe6, 0x98, 0x5e, 0x34, 0x89, 0xf2, 0x13, 0x7a, 0xeb, 0xa5, 0x1d, 0x60, 0xb1, 0xcb, + 0xa5, 0x44, 0x5a, 0xee, 0xd4, 0x87, 0xde, 0x80, 0xc7, 0xef, 0x7b, 0x0b, 0x3c, 0xbc, 0xf7, 0xf0, + 0x1e, 0x08, 0xef, 0x0e, 0x1c, 0x31, 0x1c, 0x1f, 0xd6, 0x2d, 0x36, 0xda, 0xb2, 0x99, 0x75, 0x4c, + 0xf9, 0x56, 0xf0, 0x05, 0xe1, 0xa3, 0x63, 0x47, 0x6c, 0x11, 0xdf, 0xd9, 0x0a, 0x7c, 0x6a, 0x05, + 0x75, 0x9f, 0x33, 0xc1, 0x10, 0x0a, 0x01, 0xf5, 0x08, 0x50, 0x3f, 0x79, 0xbf, 0x7c, 0x15, 0x5f, + 0x4c, 0x7c, 0xaa, 0xf9, 0xe5, 0x1b, 0x03, 0x36, 0x60, 0x6a, 0xb8, 0x25, 0x47, 0x5a, 0x5a, 0x19, + 0x30, 0x36, 0x70, 0xe9, 0x96, 0x9a, 0x1d, 0x8e, 0x8f, 0xb6, 0xec, 0x31, 0x27, 0xc2, 0x61, 0x9e, + 0xfe, 0x7d, 0xfd, 0xe2, 0xef, 0xc4, 0x9b, 0x2c, 0xa2, 0x7e, 0xc1, 0x89, 0xef, 0x53, 0xae, 0x3f, + 0x58, 0x3b, 0xcd, 0x40, 0x6e, 0x8f, 0xd9, 0xb4, 0xe7, 0x53, 0x0b, 0xdd, 0x07, 0x83, 0x78, 0x1e, + 0x13, 0x4a, 0x77, 0x60, 0xa6, 0xab, 0xe9, 0x4d, 0x63, 0x7b, 0xa3, 0x7e, 0x79, 0x4f, 0xf5, 0xc6, + 0x14, 0xd6, 0xcc, 0x7c, 0x7d, 0xb6, 0x91, 0xc2, 0x49, 0x26, 0xfa, 0x39, 0x14, 0x6c, 0x1a, 0x38, + 0x9c, 0xda, 0x7d, 0xce, 0x5c, 0x6a, 0x2e, 0x55, 0xd3, 0x9b, 0x6b, 0xdb, 0xb7, 0xe6, 0x69, 0x92, + 0x1f, 0xc7, 0xcc, 0xa5, 0xd8, 0xd0, 0x0c, 0x39, 0x41, 0xf7, 0x01, 0x46, 0x74, 0x74, 0x48, 0x79, + 0x30, 0x74, 0x7c, 0x73, 0x59, 0xd1, 0xdf, 0x5e, 0x44, 0x97, 0x6b, 0xaf, 0x3f, 0x8a, 0xe1, 0x38, + 0x41, 0x45, 0x8f, 0xa0, 0x40, 0x4e, 0x88, 0xe3, 0x92, 0x43, 0xc7, 0x75, 0xc4, 0xc4, 0xcc, 0x28, + 0x55, 0xef, 0x3c, 0x57, 0x55, 0x23, 0x41, 0xc0, 0x33, 0xf4, 0x9a, 0x0d, 0x30, 0xfd, 0x10, 0xba, + 0x0b, 0xab, 0xdd, 0xf6, 0x5e, 0xab, 0xb3, 0x77, 0xbf, 0x94, 0x2a, 0xaf, 0x3f, 0x3b, 0xad, 0xbe, + 0x2a, 0x75, 0x4c, 0x01, 0x5d, 0xea, 0xd9, 0x8e, 0x37, 0x40, 0x9b, 0x90, 0x6b, 0xec, 0xec, 0xb4, + 0xbb, 0xfb, 0xed, 0x56, 0x29, 0x5d, 0x2e, 0x3f, 0x3b, 0xad, 0xbe, 0x36, 0x0b, 0x6c, 0x58, 0x16, + 0xf5, 0x05, 0xb5, 0xcb, 0x99, 0xaf, 0xfe, 0x54, 0x49, 0xd5, 0xbe, 0x4a, 0x43, 0x21, 0xb9, 0x08, + 0x74, 0x17, 0xb2, 0x8d, 0x9d, 0xfd, 0xce, 0x41, 0xbb, 0x94, 0x9a, 0xd2, 0x93, 0x88, 0x86, 0x25, + 0x9c, 0x13, 0x8a, 0xee, 0xc0, 0x4a, 0xb7, 0xf1, 0xa4, 0xd7, 0x2e, 0xa5, 0xa7, 0xcb, 0x49, 0xc2, + 0xba, 0x64, 0x1c, 0x28, 0x54, 0x0b, 0x37, 0x3a, 0x7b, 0xa5, 0xa5, 0xf9, 0xa8, 0x16, 0x27, 0x8e, + 0xa7, 0x97, 0xf2, 0x97, 0x15, 0x30, 0x7a, 0x94, 0x9f, 0x38, 0xd6, 0x4b, 0x76, 0x91, 0x0f, 0x21, + 0x23, 0x48, 0x70, 0xac, 0x5c, 0xc3, 0x98, 0xef, 0x1a, 0xfb, 0x24, 0x38, 0x96, 0x1f, 0xd5, 0x74, + 0x85, 0x97, 0x9e, 0xc1, 0xa9, 0xef, 0x3a, 0x16, 0x11, 0xd4, 0x56, 0x9e, 0x61, 0x6c, 0xbf, 0x35, + 0x8f, 0x8d, 0x63, 0x94, 0x5e, 0xff, 0x6e, 0x0a, 0x27, 0xa8, 0xe8, 0x13, 0xc8, 0x0e, 0x5c, 0x76, + 0x48, 0x5c, 0xe5, 0x13, 0xc6, 0xf6, 0x1b, 0xf3, 0x94, 0xdc, 0x57, 0x88, 0xa9, 0x02, 0x4d, 0x41, + 0x9f, 0xc3, 0xda, 0x54, 0x55, 0xff, 0x37, 0xec, 0xd0, 0x84, 0xc5, 0x4a, 0xa6, 0x2b, 0xf9, 0x9c, + 0x1d, 0xee, 0xa6, 0x70, 0x91, 0x27, 0x05, 0xe8, 0x67, 0x00, 0xa1, 0x56, 0xa5, 0xc7, 0x50, 0x7a, + 0x6e, 0x2f, 0x5e, 0x4c, 0xa8, 0x23, 0x3f, 0x88, 0x26, 0xe8, 0x23, 0xc8, 0x8e, 0x7d, 0x9b, 0x08, + 0x6a, 0x66, 0x15, 0xb7, 0x3a, 0x8f, 0xfb, 0x44, 0x21, 0x76, 0x98, 0x77, 0xe4, 0x0c, 0xb0, 0xc6, + 0xa3, 0x9f, 0x42, 0x8e, 0x33, 0xd7, 0x3d, 0x24, 0xd6, 0xb1, 0x99, 0x7f, 0x41, 0x6e, 0xcc, 0x40, + 0x0f, 0x20, 0xe7, 0x51, 0xf1, 0x05, 0xe3, 0xc7, 0x81, 0xb9, 0x5a, 0x5d, 0xde, 0x34, 0xb6, 0xdf, + 0x9b, 0x1b, 0x56, 0x21, 0xa6, 0x21, 0x04, 0xb1, 0x86, 0x23, 0xea, 0x89, 0x50, 0x51, 0x73, 0xc9, + 0x4c, 0xe3, 0x58, 0x81, 0x5c, 0x0a, 0xf5, 0x6c, 0x9f, 0x39, 0x9e, 0x30, 0x73, 0x8b, 0x97, 0xd2, + 0xd6, 0x18, 0xe9, 0x16, 0x38, 0x66, 0x34, 0xb3, 0x90, 0x19, 0x31, 0x9b, 0xd6, 0xb6, 0xe0, 0xfa, + 0xa5, 0x63, 0x47, 0x65, 0xc8, 0x69, 0x83, 0x87, 0xfe, 0x9a, 0xc1, 0xf1, 0xbc, 0x76, 0x0d, 0x8a, + 0x33, 0x47, 0x5c, 0xb3, 0xa0, 0x38, 0x73, 0x5c, 0xe8, 0x2d, 0x58, 0x1b, 0x91, 0x2f, 0xfb, 0x16, + 0xf3, 0xac, 0x31, 0xe7, 0xd4, 0x13, 0x5a, 0x47, 0x71, 0x44, 0xbe, 0xdc, 0x89, 0x85, 0xe8, 0x3d, + 0xb8, 0x2e, 0x98, 0x20, 0x6e, 0xdf, 0x62, 0x23, 0xdf, 0xa5, 0x61, 0x74, 0x2c, 0x29, 0x64, 0x49, + 0xfd, 0xb0, 0x33, 0x95, 0xd7, 0x0c, 0xc8, 0xc7, 0x67, 0x59, 0xfb, 0xeb, 0x0a, 0xe4, 0x22, 0x4f, + 0x47, 0x0f, 0x00, 0x48, 0x6c, 0x28, 0x6d, 0x88, 0x77, 0x5e, 0xc8, 0xaa, 0x92, 0x2e, 0x3d, 0x7c, + 0x4a, 0x47, 0x0d, 0xc8, 0x5b, 0xcc, 0x13, 0xc4, 0xf1, 0x28, 0xd7, 0x91, 0x3a, 0xd7, 0x3f, 0x77, + 0x22, 0x90, 0xd6, 0x31, 0x65, 0xa1, 0x26, 0xac, 0x0e, 0xa8, 0x47, 0xb9, 0x63, 0x69, 0x07, 0xbf, + 0x3b, 0xd7, 0x31, 0x43, 0x08, 0x1e, 0x7b, 0xc2, 0x19, 0x51, 0xad, 0x25, 0x22, 0xa2, 0xcf, 0x20, + 0xcf, 0x69, 0xc0, 0xc6, 0xdc, 0xa2, 0x81, 0x0e, 0xf7, 0xcd, 0xf9, 0x61, 0x12, 0x82, 0x30, 0xfd, + 0xed, 0xd8, 0xe1, 0x54, 0x6e, 0x21, 0xc0, 0x53, 0x2a, 0xfa, 0x04, 0x56, 0x39, 0x0d, 0x04, 0xe1, + 0xe2, 0x79, 0x11, 0x8b, 0x43, 0x48, 0x97, 0xb9, 0x8e, 0x35, 0xc1, 0x11, 0x03, 0x7d, 0x02, 0x79, + 0xdf, 0x25, 0x96, 0xd2, 0x6a, 0xae, 0x2c, 0x8e, 0xb1, 0x6e, 0x04, 0xc2, 0x53, 0x3c, 0xfa, 0x18, + 0xc0, 0x65, 0x83, 0xbe, 0xcd, 0x9d, 0x13, 0xca, 0x75, 0x94, 0x95, 0xe7, 0xb1, 0x5b, 0x0a, 0x81, + 0xf3, 0x2e, 0x1b, 0x84, 0x43, 0x74, 0xff, 0x7f, 0x0a, 0x92, 0x44, 0x80, 0xbc, 0x01, 0x85, 0x23, + 0xc6, 0x2d, 0xda, 0xd7, 0xb1, 0x9e, 0x57, 0xbe, 0x65, 0x28, 0x59, 0x18, 0xa0, 0xe8, 0xd7, 0xf0, + 0x4a, 0x64, 0xad, 0x3e, 0xa7, 0x47, 0x94, 0x53, 0x4f, 0x9a, 0xdc, 0x50, 0x9f, 0x7d, 0xeb, 0xf9, + 0x26, 0xd7, 0x68, 0x9d, 0x6a, 0x11, 0xbf, 0xf8, 0x43, 0xd0, 0xcc, 0xc3, 0x2a, 0x0f, 0x0f, 0xb8, + 0xf6, 0xfb, 0xb4, 0x8c, 0xb3, 0x0b, 0x08, 0xb4, 0x05, 0x46, 0xfc, 0x79, 0xc7, 0x56, 0x0e, 0x97, + 0x6f, 0xae, 0x9d, 0x9f, 0x6d, 0x40, 0x84, 0xed, 0xb4, 0x64, 0x06, 0xd6, 0x63, 0x1b, 0xb5, 0xa1, + 0x18, 0x13, 0x64, 0x11, 0xa4, 0xcb, 0x84, 0xea, 0xf3, 0x56, 0xba, 0x3f, 0xf1, 0x29, 0x2e, 0xf0, + 0xc4, 0xac, 0xf6, 0x2b, 0x40, 0x97, 0x1d, 0x10, 0x21, 0xc8, 0x1c, 0x3b, 0x9e, 0x5e, 0x06, 0x56, + 0x63, 0x54, 0x87, 0x55, 0x9f, 0x4c, 0x5c, 0x46, 0x6c, 0xed, 0x87, 0x37, 0xea, 0x61, 0x79, 0x54, + 0x8f, 0xca, 0xa3, 0x7a, 0xc3, 0x9b, 0xe0, 0x08, 0x54, 0x7b, 0x00, 0xaf, 0xce, 0x8d, 0x33, 0xb4, + 0x0d, 0x85, 0x38, 0x46, 0xa6, 0x7b, 0xbd, 0x76, 0x7e, 0xb6, 0x61, 0xc4, 0xc1, 0xd4, 0x69, 0x61, + 0x23, 0x06, 0x75, 0xec, 0xda, 0x77, 0x6b, 0x50, 0x9c, 0x89, 0x34, 0x74, 0x03, 0x56, 0x9c, 0x11, + 0x19, 0x50, 0xbd, 0xc6, 0x70, 0x82, 0xda, 0x90, 0x75, 0xc9, 0x21, 0x75, 0x65, 0xac, 0xc8, 0x83, + 0xfb, 0xd1, 0x95, 0x21, 0x5b, 0x7f, 0xa8, 0xf0, 0x6d, 0x4f, 0xf0, 0x09, 0xd6, 0x64, 0x64, 0xc2, + 0xaa, 0xc5, 0x46, 0x23, 0xe2, 0xc9, 0x4b, 0x72, 0x79, 0x33, 0x8f, 0xa3, 0xa9, 0xb4, 0x0c, 0xe1, + 0x83, 0xc0, 0xcc, 0x28, 0xb1, 0x1a, 0xcb, 0x1c, 0x39, 0x64, 0x81, 0xf0, 0xc8, 0x88, 0x9a, 0x6b, + 0x6a, 0x35, 0xf1, 0x1c, 0x95, 0x60, 0x99, 0x7a, 0x27, 0xe6, 0x8a, 0x82, 0xcb, 0xa1, 0x94, 0xd8, + 0x4e, 0x18, 0x08, 0x79, 0x2c, 0x87, 0x52, 0xe7, 0x38, 0xa0, 0xdc, 0x5c, 0x0d, 0xad, 0x2d, 0xc7, + 0xe8, 0x35, 0xc8, 0x0e, 0x38, 0x1b, 0xfb, 0xa1, 0x07, 0xe6, 0xb1, 0x9e, 0xc9, 0xfb, 0xce, 0xe7, + 0xce, 0x89, 0xe3, 0xd2, 0x01, 0x0d, 0xcc, 0xd7, 0xd4, 0x41, 0x54, 0xe6, 0xc6, 0x62, 0x8c, 0xc2, + 0x09, 0x06, 0xaa, 0x43, 0xc6, 0xf1, 0x1c, 0x61, 0xbe, 0xae, 0xe3, 0xf0, 0xe2, 0x11, 0x36, 0x19, + 0x73, 0x0f, 0x88, 0x3b, 0xa6, 0x58, 0xe1, 0xd0, 0x3a, 0x2c, 0x0b, 0x31, 0x31, 0x8b, 0xd5, 0xf4, + 0x66, 0xae, 0xb9, 0x7a, 0x7e, 0xb6, 0xb1, 0xbc, 0xbf, 0xff, 0x14, 0x4b, 0x19, 0xba, 0x0d, 0xc0, + 0x7c, 0xea, 0xf5, 0x03, 0x61, 0x3b, 0x9e, 0x89, 0x24, 0x02, 0xe7, 0xa5, 0xa4, 0x27, 0x05, 0xe8, + 0xa6, 0xcc, 0x5c, 0xc4, 0xee, 0x33, 0xcf, 0x9d, 0x98, 0xaf, 0xa8, 0x5f, 0x73, 0x52, 0xf0, 0xd8, + 0x73, 0x27, 0x68, 0x03, 0x8c, 0x40, 0x30, 0xbf, 0x1f, 0x38, 0x03, 0x8f, 0xb8, 0xe6, 0x0d, 0xb5, + 0x73, 0x90, 0xa2, 0x9e, 0x92, 0xa0, 0x9f, 0x40, 0x76, 0xc4, 0xc6, 0x9e, 0x08, 0xcc, 0x9c, 0x3a, + 0xc8, 0xf5, 0x79, 0x7b, 0x7c, 0x24, 0x11, 0x3a, 0xea, 0x34, 0x1c, 0xb5, 0xe1, 0xba, 0xd2, 0x3c, + 0xe0, 0xc4, 0xa2, 0x7d, 0x9f, 0x72, 0x87, 0xd9, 0xfa, 0x7e, 0x5e, 0xbf, 0xb4, 0xdb, 0x96, 0x6e, + 0x05, 0xf0, 0x35, 0xc9, 0xb9, 0x2f, 0x29, 0x5d, 0xc5, 0x40, 0x5d, 0x28, 0xf8, 0x63, 0xd7, 0xed, + 0x33, 0x3f, 0xbc, 0x8d, 0xc2, 0x04, 0xfe, 0x02, 0xee, 0xd4, 0x1d, 0xbb, 0xee, 0xe3, 0x90, 0x84, + 0x0d, 0x7f, 0x3a, 0x41, 0x9f, 0xc2, 0x6a, 0x40, 0x2d, 0x4e, 0x45, 0x60, 0x16, 0xd4, 0x96, 0xde, + 0x9c, 0xa7, 0xac, 0xa7, 0x20, 0x71, 0x5e, 0xc0, 0x11, 0x47, 0xd2, 0x2d, 0x95, 0xd6, 0x02, 0xf3, + 0xd5, 0xc5, 0x74, 0x9d, 0xf9, 0xa6, 0x74, 0xcd, 0x91, 0xe1, 0x22, 0x7d, 0x32, 0x30, 0xaf, 0x2b, + 0x77, 0x0a, 0x27, 0xe8, 0x29, 0x80, 0xed, 0x05, 0xfd, 0x10, 0x64, 0x5e, 0x53, 0x7b, 0x7c, 0xef, + 0xea, 0x3d, 0xb6, 0xf6, 0x7a, 0xba, 0x0e, 0x29, 0x9e, 0x9f, 0x6d, 0xe4, 0xe3, 0x29, 0xce, 0xdb, + 0x5e, 0x10, 0x0e, 0x51, 0x13, 0x8c, 0x21, 0x25, 0xae, 0x18, 0x5a, 0x43, 0x6a, 0x1d, 0x9b, 0xa5, + 0xc5, 0x65, 0xc9, 0xae, 0x82, 0x69, 0x0d, 0x49, 0x12, 0xea, 0x40, 0xde, 0x09, 0x98, 0xab, 0x8e, + 0xc8, 0x34, 0x55, 0x7e, 0x7b, 0x81, 0xd5, 0x75, 0x22, 0x0a, 0x9e, 0xb2, 0xd1, 0x2d, 0xc8, 0xfb, + 0x8e, 0x1d, 0x3c, 0x74, 0x46, 0x8e, 0x30, 0xd7, 0xab, 0xe9, 0xcd, 0x65, 0x3c, 0x15, 0xa0, 0x5d, + 0x58, 0x0d, 0x26, 0x81, 0x25, 0xdc, 0xc0, 0x2c, 0x2b, 0xe3, 0xd6, 0xaf, 0xfe, 0x4c, 0x2f, 0x24, + 0x84, 0x89, 0x23, 0xa2, 0xcb, 0x8a, 0xc7, 0x22, 0xbe, 0xee, 0x05, 0xfa, 0xc4, 0xb6, 0xcd, 0x9b, + 0xca, 0xe0, 0xc5, 0xa9, 0xb4, 0x61, 0xdb, 0xe8, 0x6d, 0xb8, 0x96, 0x80, 0xd9, 0x9c, 0xf9, 0xe6, + 0x2d, 0x85, 0x4b, 0xb0, 0x5b, 0x9c, 0xf9, 0xb2, 0x86, 0x18, 0xbb, 0x72, 0x8d, 0x81, 0x79, 0x5b, + 0xad, 0x6c, 0xf3, 0xea, 0x95, 0x3d, 0x51, 0x04, 0x1c, 0x11, 0x51, 0x25, 0x91, 0x33, 0x6c, 0xb3, + 0xa2, 0x42, 0x31, 0x21, 0x29, 0x7f, 0x0c, 0x46, 0x22, 0x09, 0xca, 0x04, 0x75, 0x4c, 0x27, 0x3a, + 0xaf, 0xca, 0xa1, 0x74, 0x9e, 0x13, 0x99, 0x13, 0x54, 0xe2, 0xcf, 0xe3, 0x70, 0x72, 0x6f, 0xe9, + 0xa3, 0x74, 0x79, 0x1b, 0x8c, 0x84, 0xc3, 0xa3, 0x37, 0xe5, 0xa5, 0x34, 0x70, 0x02, 0xc1, 0x27, + 0x7d, 0x32, 0x16, 0x43, 0xf3, 0x17, 0x8a, 0x50, 0x88, 0x84, 0x8d, 0xb1, 0x18, 0x96, 0xfb, 0x30, + 0xf5, 0x18, 0x54, 0x05, 0x43, 0xe6, 0xc9, 0x80, 0xf2, 0x13, 0xca, 0x65, 0x89, 0x29, 0x8d, 0x90, + 0x14, 0xc9, 0x4c, 0x18, 0x50, 0xc2, 0xad, 0xa1, 0x4a, 0xe9, 0x79, 0xac, 0x67, 0x32, 0x47, 0x47, + 0xc1, 0xa9, 0x73, 0xb4, 0x9e, 0x96, 0xef, 0x41, 0x21, 0x79, 0x38, 0xff, 0xd5, 0x86, 0x5a, 0x90, + 0x0d, 0xcd, 0x27, 0xb3, 0xb2, 0xca, 0xe8, 0xfa, 0x0e, 0x54, 0xd9, 0x1c, 0x41, 0x26, 0x60, 0x47, + 0x42, 0xd1, 0x96, 0xb1, 0x1a, 0x4b, 0xd9, 0x90, 0xf0, 0xb0, 0x9b, 0x5a, 0xc6, 0x6a, 0x5c, 0xfb, + 0x5b, 0x1a, 0xf2, 0xb1, 0x1b, 0xa2, 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, 0x78, 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, 0xab, 0xff, 0x4c, 0x43, 0x21, 0xd9, 0x21, 0xa0, 0x9d, 0xb0, + 0x2f, 0x50, 0x06, 0x58, 0xdb, 0xde, 0xba, 0xaa, 0xa3, 0x50, 0x55, 0x86, 0x3b, 0x96, 0x7a, 0x1f, + 0x31, 0x9b, 0x62, 0x45, 0x46, 0x1f, 0xc0, 0x8a, 0xcf, 0xb8, 0x88, 0xee, 0xe3, 0xf9, 0x57, 0x15, + 0xe3, 0x51, 0xc9, 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, 0x45, 0xff, 0xd7, 0x12, 0x18, + 0xba, 0x4c, 0x79, 0xd9, 0xaf, 0x38, 0xc5, 0xb0, 0xe4, 0x8d, 0xb2, 0xeb, 0xd2, 0x95, 0x95, 0x6f, + 0x21, 0x24, 0xe8, 0xc8, 0x78, 0x03, 0x0a, 0x8e, 0x7f, 0xf2, 0x61, 0x9f, 0x7a, 0xe4, 0xd0, 0xd5, + 0xdd, 0x7a, 0x0e, 0x1b, 0x52, 0xd6, 0x0e, 0x45, 0xb2, 0xf0, 0x70, 0x3c, 0x41, 0xb9, 0xa7, 0xfb, + 0xf0, 0x1c, 0x8e, 0xe7, 0xe8, 0x53, 0xc8, 0x38, 0x3e, 0x19, 0xe9, 0x72, 0x7d, 0xee, 0x0e, 0x3a, + 0xdd, 0xc6, 0x23, 0x1d, 0xb9, 0xcd, 0xdc, 0xf9, 0xd9, 0x46, 0x46, 0x0a, 0xb0, 0xa2, 0xc9, 0x9c, + 0x11, 0x36, 0x43, 0xf2, 0x4b, 0xaa, 0x58, 0xc9, 0xe1, 0x84, 0x44, 0x46, 0x9f, 0xe3, 0x0d, 0x38, + 0x0d, 0x02, 0x55, 0xb6, 0xe4, 0x70, 0x34, 0x45, 0x65, 0x58, 0xd5, 0x75, 0xb7, 0x6a, 0xc1, 0xf2, + 0xb2, 0x9b, 0xd1, 0x82, 0x66, 0x11, 0x8c, 0xd0, 0x1a, 0xfd, 0x23, 0xce, 0x46, 0xb5, 0x7f, 0x67, + 0xc0, 0xd8, 0x71, 0xc7, 0x81, 0xd0, 0x35, 0xdd, 0x4b, 0x33, 0xfe, 0x53, 0xb8, 0x4e, 0xd4, 0xab, + 0x10, 0xf1, 0x64, 0x11, 0xa0, 0xda, 0x19, 0x7d, 0x00, 0x77, 0xe6, 0xaa, 0x8b, 0xc1, 0x61, 0xeb, + 0xd3, 0xcc, 0x4a, 0x9d, 0x66, 0x1a, 0x97, 0xc8, 0x85, 0x5f, 0x50, 0x0f, 0x8a, 0x8c, 0x5b, 0x43, + 0x1a, 0x88, 0xb0, 0x74, 0xd0, 0xaf, 0x28, 0x73, 0xdf, 0xd7, 0x1e, 0x27, 0x81, 0xfa, 0xc6, 0x0c, + 0x57, 0x3b, 0xab, 0x03, 0x7d, 0x04, 0x19, 0x4e, 0x8e, 0xa2, 0xd6, 0x6c, 0x6e, 0x90, 0x60, 0x72, + 0x24, 0x66, 0x54, 0x28, 0x06, 0xfa, 0x1c, 0xc0, 0x76, 0x02, 0x9f, 0x08, 0x6b, 0x48, 0xb9, 0x3e, + 0xec, 0xb9, 0x5b, 0x6c, 0xc5, 0xa8, 0x19, 0x2d, 0x09, 0x36, 0x7a, 0x00, 0x79, 0x8b, 0x44, 0xee, + 0x9a, 0x5d, 0xfc, 0xb4, 0xb4, 0xd3, 0xd0, 0x2a, 0x4a, 0x52, 0xc5, 0xf9, 0xd9, 0x46, 0x2e, 0x92, + 0xe0, 0x9c, 0x45, 0xb4, 0xfb, 0x3e, 0x80, 0xa2, 0x20, 0xc1, 0x71, 0xdf, 0x0e, 0xd3, 0x59, 0xe8, + 0x26, 0x0b, 0x2a, 0x00, 0xd9, 0xc1, 0xeb, 0xb4, 0x17, 0x1d, 0x67, 0x41, 0x24, 0x64, 0xe8, 0x97, + 0x70, 0x9d, 0x7a, 0x16, 0x9f, 0x28, 0x67, 0x8d, 0x56, 0x98, 0x5b, 0xbc, 0xd9, 0x76, 0x0c, 0x9e, + 0xd9, 0x6c, 0x89, 0x5e, 0x90, 0xd7, 0xfe, 0x91, 0x06, 0x08, 0x4b, 0xae, 0x97, 0xeb, 0x80, 0x08, + 0x32, 0x36, 0x11, 0x44, 0xf9, 0x5c, 0x01, 0xab, 0x31, 0xba, 0x07, 0x20, 0xe8, 0xc8, 0x97, 0xa9, + 0xd7, 0x1b, 0x68, 0xb7, 0x79, 0x5e, 0x3a, 0x48, 0xa0, 0xd1, 0x36, 0x64, 0x75, 0x03, 0x9d, 0xb9, + 0x92, 0xa7, 0x91, 0xb5, 0x3f, 0xa7, 0x01, 0xc2, 0x6d, 0xfe, 0x5f, 0xef, 0xad, 0xf6, 0xf7, 0x15, + 0x80, 0x03, 0xe6, 0x8e, 0x47, 0x2f, 0xf9, 0x91, 0xf4, 0x06, 0xac, 0xa8, 0xa6, 0x29, 0xba, 0xe4, + 0xd5, 0x24, 0x61, 0xc9, 0xe5, 0x17, 0xb5, 0x24, 0x6a, 0x83, 0x21, 0xf3, 0x40, 0x10, 0xf4, 0xd5, + 0x85, 0x98, 0x59, 0xec, 0x78, 0xe1, 0x3e, 0x1a, 0x0a, 0xac, 0x6e, 0x41, 0x20, 0xf1, 0x18, 0xdd, + 0x9b, 0x76, 0x00, 0x2b, 0xea, 0x36, 0xac, 0x2e, 0x56, 0xa1, 0xfb, 0x80, 0xb8, 0xfc, 0xa7, 0xb0, + 0x1e, 0x6a, 0x75, 0xf4, 0xd3, 0x7a, 0xe2, 0x9d, 0x47, 0xc7, 0xea, 0xdc, 0x14, 0xb4, 0xcf, 0x7c, + 0xe6, 0xb2, 0x41, 0x12, 0x8f, 0x17, 0x6b, 0x42, 0xbb, 0x61, 0xf9, 0x6a, 0xc9, 0xaa, 0x94, 0x13, + 0x6f, 0x40, 0x75, 0xd8, 0xce, 0x7f, 0xfa, 0xd2, 0x48, 0x2c, 0x81, 0x61, 0x85, 0x1b, 0x4f, 0xd1, + 0x93, 0x0b, 0xff, 0x1d, 0xe4, 0x54, 0x15, 0xf1, 0xfe, 0x73, 0x76, 0x2c, 0x6b, 0x08, 0x6d, 0xbf, + 0xc5, 0xff, 0x21, 0xfc, 0x31, 0x0d, 0xe8, 0x32, 0x08, 0x6d, 0x26, 0xde, 0xf8, 0x55, 0xb1, 0x73, + 0x19, 0xa3, 0x5f, 0xf9, 0xef, 0x4e, 0x5f, 0xf9, 0x55, 0x29, 0x71, 0x19, 0x18, 0xbe, 0xf3, 0xdf, + 0x9d, 0xbe, 0xf3, 0x2f, 0xc0, 0x25, 0x5e, 0xfa, 0x9b, 0x77, 0xbe, 0xfe, 0xbe, 0x92, 0xfa, 0xf6, + 0xfb, 0x4a, 0xea, 0x77, 0xe7, 0x95, 0xf4, 0xd7, 0xe7, 0x95, 0xf4, 0x37, 0xe7, 0x95, 0xf4, 0x77, + 0xe7, 0x95, 0xf4, 0x1f, 0x7e, 0xa8, 0xa4, 0xbe, 0xf9, 0xa1, 0x92, 0xfa, 0xf6, 0x87, 0x4a, 0xea, + 0x30, 0xab, 0x1a, 0xcf, 0x1f, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x0c, 0xec, 0xe3, 0x15, + 0x1b, 0x00, 0x00, } func (m *NodeSpec) Copy() *NodeSpec { @@ -2836,6 +2839,18 @@ func (m *ContainerSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Privileged { + i-- + if m.Privileged { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xf0 + } if len(m.Ulimits) > 0 { for iNdEx := len(m.Ulimits) - 1; iNdEx >= 0; iNdEx-- { { @@ -4211,6 +4226,9 @@ func (m *ContainerSpec) Size() (n int) { n += 2 + l + sovSpecs(uint64(l)) } } + if m.Privileged { + n += 3 + } return n } @@ -4724,6 +4742,7 @@ func (this *ContainerSpec) String() string { `CapabilityAdd:` + fmt.Sprintf("%v", this.CapabilityAdd) + `,`, `CapabilityDrop:` + fmt.Sprintf("%v", this.CapabilityDrop) + `,`, `Ulimits:` + repeatedStringForUlimits + `,`, + `Privileged:` + fmt.Sprintf("%v", this.Privileged) + `,`, `}`, }, "") return s @@ -7476,6 +7495,26 @@ func (m *ContainerSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 30: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Privileged", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpecs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Privileged = bool(v != 0) default: iNdEx = preIndex skippy, err := skipSpecs(dAtA[iNdEx:]) diff --git a/api/specs.proto b/api/specs.proto index a097b2be3c..55a2a84cf1 100644 --- a/api/specs.proto +++ b/api/specs.proto @@ -370,6 +370,9 @@ 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; + + // Privileged give extended privileges to the container + bool privileged = 30; } // EndpointSpec defines the properties that can be configured to diff --git a/protobuf/plugin/deepcopy/test/deepcopypb_test.go b/protobuf/plugin/deepcopy/test/deepcopypb_test.go index f542bb67d0..12e30be428 100644 --- a/protobuf/plugin/deepcopy/test/deepcopypb_test.go +++ b/protobuf/plugin/deepcopy/test/deepcopypb_test.go @@ -713,6 +713,88 @@ func TestOneOfProtoCompactText(t *testing.T) { } } +func TestBasicScalarStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedBasicScalar(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedScalarStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedScalar(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedScalarPackedStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedScalarPacked(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestNonNullableExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedNonNullableExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestRepeatedNonNullableExternalStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedRepeatedNonNullableExternalStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestMapStructStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedMapStruct(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} +func TestOneOfStringer(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedOneOf(popr, false) + s1 := p.String() + s2 := fmt.Sprintf("%v", p) + if s1 != s2 { + t.Fatalf("String want %v got %v", s1, s2) + } +} + func TestBasicScalarCopy(t *testing.T) { popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) in := NewPopulatedBasicScalar(popr, true) @@ -1050,86 +1132,5 @@ func TestOneOfCopy(t *testing.T) { t.Fatalf("copying nil should return nil, returned: %#v", out) } } -func TestBasicScalarStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedBasicScalar(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedScalarStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedScalar(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedScalarPackedStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedScalarPacked(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestNonNullableExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedNonNullableExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestRepeatedNonNullableExternalStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedRepeatedNonNullableExternalStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestMapStructStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedMapStruct(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} -func TestOneOfStringer(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - p := NewPopulatedOneOf(popr, false) - s1 := p.String() - s2 := fmt.Sprintf("%v", p) - if s1 != s2 { - t.Fatalf("String want %v got %v", s1, s2) - } -} //These tests are generated by github.com/gogo/protobuf/plugin/testgen From 22f4dea01454daf201577a383c1a74767bb39926 Mon Sep 17 00:00:00 2001 From: Olli Janatuinen Date: Tue, 2 Aug 2022 17:12:15 +0000 Subject: [PATCH 2/2] Implement privileged support Signed-off-by: Olli Janatuinen --- agent/exec/dockerapi/container.go | 1 + agent/exec/dockerapi/container_test.go | 20 ++++++++++++++++++++ cmd/swarmctl/service/flagparser/container.go | 8 ++++++++ cmd/swarmctl/service/flagparser/flags.go | 1 + 4 files changed, 30 insertions(+) diff --git a/agent/exec/dockerapi/container.go b/agent/exec/dockerapi/container.go index 2a5e74b945..30b1d5dc48 100644 --- a/agent/exec/dockerapi/container.go +++ b/agent/exec/dockerapi/container.go @@ -212,6 +212,7 @@ func (c *containerConfig) hostConfig() *enginecontainer.HostConfig { Isolation: c.isolation(), CapAdd: c.spec().CapabilityAdd, CapDrop: c.spec().CapabilityDrop, + Privileged: c.spec().Privileged, } // The format of extra hosts on swarmkit is specified in: diff --git a/agent/exec/dockerapi/container_test.go b/agent/exec/dockerapi/container_test.go index 7b64a25bc0..a7f4b3e1ab 100644 --- a/agent/exec/dockerapi/container_test.go +++ b/agent/exec/dockerapi/container_test.go @@ -299,6 +299,26 @@ func TestCapabilityDrop(t *testing.T) { } } +func TestPrivileged(t *testing.T) { + c := containerConfig{ + task: &api.Task{ + Spec: api.TaskSpec{ + Runtime: &api.TaskSpec_Container{ + Container: &api.ContainerSpec{ + Privileged: true, + }, + }, + }, + }, + } + + expected := true + actual := c.hostConfig().Privileged + if !reflect.DeepEqual(actual, expected) { + t.Fatalf("expected %v, got %v", expected, actual) + } +} + func TestUlimits(t *testing.T) { c := containerConfig{ task: &api.Task{ diff --git a/cmd/swarmctl/service/flagparser/container.go b/cmd/swarmctl/service/flagparser/container.go index 568ebd7c85..e0192edd4e 100644 --- a/cmd/swarmctl/service/flagparser/container.go +++ b/cmd/swarmctl/service/flagparser/container.go @@ -76,5 +76,13 @@ func parseContainer(flags *pflag.FlagSet, spec *api.ServiceSpec) error { } } + if flags.Changed("privileged") { + privileged, err := flags.GetBool("privileged") + if err != nil { + return err + } + spec.Task.GetContainer().Privileged = privileged + } + return nil } diff --git a/cmd/swarmctl/service/flagparser/flags.go b/cmd/swarmctl/service/flagparser/flags.go index ef1765a0a6..7e954533f9 100644 --- a/cmd/swarmctl/service/flagparser/flags.go +++ b/cmd/swarmctl/service/flagparser/flags.go @@ -25,6 +25,7 @@ func AddServiceFlags(flags *pflag.FlagSet) { flags.StringSlice("env", nil, "container env") flags.Bool("tty", false, "open a tty on standard streams") flags.Bool("open-stdin", false, "open standard input") + flags.Bool("privileged", false, "give extended privileges to container (default false)") flags.StringSlice("ports", nil, "ports") flags.String("network", "", "network name")