linux: Honor RuncOptions if set on container

This also fix the type used for RuncOptions.SystemCgroup, hence introducing an API break. Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-30 15:20:57 -07:00
parent e0d8cb1366
commit ab0cb4e756
12 changed files with 378 additions and 222 deletions
--- a/linux/runcopts/runc.pb.go
+++ b/linux/runcopts/runc.pb.go
@@ -37,8 +37,9 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package

 type RuncOptions struct {
-	CriuPath      string `protobuf:"bytes,1,opt,name=criu_path,json=criuPath,proto3" json:"criu_path,omitempty"`
-	SystemdCgroup string `protobuf:"bytes,2,opt,name=systemd_cgroup,json=systemdCgroup,proto3" json:"systemd_cgroup,omitempty"`
+	Runtime       string `protobuf:"bytes,1,opt,name=runtime,proto3" json:"runtime,omitempty"`
+	CriuPath      string `protobuf:"bytes,2,opt,name=criu_path,json=criuPath,proto3" json:"criu_path,omitempty"`
+	SystemdCgroup bool   `protobuf:"varint,3,opt,name=systemd_cgroup,json=systemdCgroup,proto3" json:"systemd_cgroup,omitempty"`
 }

 func (m *RuncOptions) Reset()                    { *m = RuncOptions{} }
@@ -95,17 +96,27 @@ func (m *RuncOptions) MarshalTo(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.CriuPath) > 0 {
+	if len(m.Runtime) > 0 {
 		dAtA[i] = 0xa
 		i++
+		i = encodeVarintRunc(dAtA, i, uint64(len(m.Runtime)))
+		i += copy(dAtA[i:], m.Runtime)
+	}
+	if len(m.CriuPath) > 0 {
+		dAtA[i] = 0x12
+		i++
 		i = encodeVarintRunc(dAtA, i, uint64(len(m.CriuPath)))
 		i += copy(dAtA[i:], m.CriuPath)
 	}
-	if len(m.SystemdCgroup) > 0 {
-		dAtA[i] = 0x12
+	if m.SystemdCgroup {
+		dAtA[i] = 0x18
+		i++
+		if m.SystemdCgroup {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
 		i++
-		i = encodeVarintRunc(dAtA, i, uint64(len(m.SystemdCgroup)))
-		i += copy(dAtA[i:], m.SystemdCgroup)
 	}
 	return i, nil
 }
@@ -334,13 +345,16 @@ func encodeVarintRunc(dAtA []byte, offset int, v uint64) int {
 func (m *RuncOptions) Size() (n int) {
 	var l int
 	_ = l
+	l = len(m.Runtime)
+	if l > 0 {
+		n += 1 + l + sovRunc(uint64(l))
+	}
 	l = len(m.CriuPath)
 	if l > 0 {
 		n += 1 + l + sovRunc(uint64(l))
 	}
-	l = len(m.SystemdCgroup)
-	if l > 0 {
-		n += 1 + l + sovRunc(uint64(l))
+	if m.SystemdCgroup {
+		n += 2
 	}
 	return n
 }
@@ -432,6 +446,7 @@ func (this *RuncOptions) String() string {
 		return "nil"
 	}
 	s := strings.Join([]string{`&RuncOptions{`,
+		`Runtime:` + fmt.Sprintf("%v", this.Runtime) + `,`,
 		`CriuPath:` + fmt.Sprintf("%v", this.CriuPath) + `,`,
 		`SystemdCgroup:` + fmt.Sprintf("%v", this.SystemdCgroup) + `,`,
 		`}`,
@@ -510,6 +525,35 @@ func (m *RuncOptions) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Runtime", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRunc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRunc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Runtime = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field CriuPath", wireType)
 			}
@@ -538,11 +582,11 @@ func (m *RuncOptions) Unmarshal(dAtA []byte) error {
 			}
 			m.CriuPath = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
+		case 3:
+			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field SystemdCgroup", wireType)
 			}
-			var stringLen uint64
+			var v int
 			for shift := uint(0); ; shift += 7 {
 				if shift >= 64 {
 					return ErrIntOverflowRunc
@@ -552,21 +596,12 @@ func (m *RuncOptions) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
+				v |= (int(b) & 0x7F) << shift
 				if b < 0x80 {
 					break
 				}
 			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthRunc
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.SystemdCgroup = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
+			m.SystemdCgroup = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRunc(dAtA[iNdEx:])
@@ -1163,33 +1198,34 @@ func init() {
 }

 var fileDescriptorRunc = []byte{
-	// 438 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x93, 0xb1, 0x6f, 0xd4, 0x30,
-	0x18, 0xc5, 0x9b, 0xb6, 0xb4, 0x89, 0xaf, 0x57, 0xc0, 0x50, 0x29, 0x14, 0x11, 0xca, 0x09, 0xa4,
-	0xb2, 0xdc, 0x49, 0xb0, 0x20, 0xd8, 0xb8, 0x11, 0x28, 0x25, 0xc0, 0xc2, 0x62, 0xa5, 0xbe, 0x8f,
-	0xc4, 0xba, 0xe4, 0xfb, 0x2c, 0xdb, 0xa1, 0xb9, 0x8d, 0x3f, 0xaf, 0x23, 0x62, 0x62, 0xa4, 0xf9,
-	0x47, 0x40, 0x71, 0x2e, 0x85, 0x95, 0x95, 0xed, 0xf9, 0xf7, 0x9e, 0x9e, 0xa5, 0x27, 0x7d, 0xec,
-	0x79, 0xae, 0x5c, 0x51, 0x9f, 0x4d, 0x25, 0x55, 0x33, 0x49, 0xe8, 0x32, 0x85, 0x60, 0x16, 0x7f,
-	0xcb, 0x52, 0x61, 0xdd, 0xcc, 0x4c, 0x8d, 0x92, 0xb4, 0xb3, 0x5e, 0x4c, 0xb5, 0x21, 0x47, 0xfc,
-	0xe0, 0x4f, 0x6a, 0xea, 0x53, 0xd3, 0xce, 0x3c, 0xbc, 0x9d, 0x53, 0x4e, 0x3e, 0x31, 0xeb, 0x54,
-	0x1f, 0x9e, 0xbc, 0x63, 0xa3, 0xb4, 0x46, 0xf9, 0x56, 0x3b, 0x45, 0x68, 0xf9, 0x5d, 0x16, 0x49,
-	0xa3, 0x6a, 0xa1, 0x33, 0x57, 0xc4, 0xc1, 0x51, 0x70, 0x1c, 0xa5, 0x61, 0x07, 0x4e, 0x33, 0x57,
-	0xf0, 0x47, 0x6c, 0xdf, 0xae, 0xac, 0x83, 0x6a, 0x21, 0x64, 0x6e, 0xa8, 0xd6, 0xf1, 0xa6, 0x4f,
-	0x8c, 0xd7, 0x74, 0xee, 0xe1, 0xe4, 0xfb, 0x26, 0x1b, 0xcf, 0x0d, 0x64, 0x0e, 0x86, 0xd6, 0x09,
-	0x1b, 0x23, 0x09, 0xad, 0xbe, 0x90, 0x13, 0x86, 0xc8, 0xf9, 0xe6, 0x30, 0x1d, 0x21, 0x9d, 0x76,
-	0x2c, 0x25, 0x72, 0xfc, 0x0e, 0x0b, 0x49, 0x03, 0x0a, 0x27, 0xfb, 0xda, 0x30, 0xdd, 0xed, 0xde,
-	0x1f, 0xa4, 0xe6, 0x4f, 0xd8, 0x01, 0x34, 0x0e, 0x0c, 0x66, 0xa5, 0xa8, 0x51, 0x35, 0xc2, 0x92,
-	0x5c, 0x82, 0xb3, 0xf1, 0x96, 0xcf, 0xdd, 0x1a, 0xcc, 0x8f, 0xa8, 0x9a, 0xf7, 0xbd, 0xc5, 0x0f,
-	0x59, 0xe8, 0xc0, 0x54, 0x0a, 0xb3, 0x32, 0xde, 0xf6, 0xb1, 0xab, 0x37, 0xbf, 0xc7, 0xd8, 0x67,
-	0x55, 0x82, 0x28, 0x49, 0x2e, 0x6d, 0x7c, 0xcd, 0xbb, 0x51, 0x47, 0x5e, 0x77, 0x80, 0x3f, 0x66,
-	0x37, 0xa0, 0xd2, 0x6e, 0x25, 0x30, 0xab, 0xc0, 0xea, 0x4c, 0x82, 0x8d, 0x77, 0x8e, 0xb6, 0x8e,
-	0xa3, 0xf4, 0xba, 0xe7, 0x27, 0x57, 0x98, 0x3f, 0x60, 0x7b, 0xfd, 0x12, 0x56, 0x54, 0xb4, 0x80,
-	0x78, 0xd7, 0xef, 0x31, 0x5a, 0xb3, 0x37, 0xb4, 0x00, 0xfe, 0x90, 0xed, 0x23, 0x09, 0x84, 0x73,
-	0xb1, 0x84, 0x95, 0x51, 0x98, 0xc7, 0xa1, 0xff, 0x70, 0x0f, 0xe9, 0x04, 0xce, 0x5f, 0xf5, 0x8c,
-	0xdf, 0x67, 0x23, 0x5b, 0xa8, 0x6a, 0xd8, 0x35, 0xf2, 0x3d, 0xac, 0x43, 0xeb, 0x51, 0x7f, 0x05,
-	0xec, 0xe6, 0xbc, 0x00, 0xb9, 0xd4, 0xa4, 0xd0, 0x0d, 0xc3, 0x72, 0xb6, 0x0d, 0x8d, 0x1a, 0xf6,
-	0xf4, 0xfa, 0x7f, 0x1d, 0xf2, 0x65, 0x7a, 0x71, 0x99, 0x6c, 0xfc, 0xb8, 0x4c, 0x36, 0xbe, 0xb6,
-	0x49, 0x70, 0xd1, 0x26, 0xc1, 0xb7, 0x36, 0x09, 0x7e, 0xb6, 0x49, 0xf0, 0xe9, 0xd9, 0x3f, 0x1e,
-	0xcb, 0x8b, 0x41, 0x9c, 0xed, 0xf8, 0x23, 0x78, 0xfa, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x00, 0x19,
-	0xba, 0x8f, 0x6f, 0x03, 0x00, 0x00,
+	// 453 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x93, 0x41, 0x6f, 0xd3, 0x4e,
+	0x14, 0xc4, 0xeb, 0xb6, 0xff, 0xc6, 0xde, 0x34, 0xfd, 0xc3, 0x42, 0x25, 0x53, 0x84, 0x09, 0x11,
+	0x48, 0xe1, 0x92, 0x48, 0x70, 0x41, 0x70, 0x23, 0x47, 0xa0, 0x54, 0x06, 0x2e, 0x5c, 0x56, 0xee,
+	0xe6, 0x61, 0xaf, 0x6c, 0xbf, 0xb7, 0xda, 0x5d, 0x53, 0xe7, 0xc6, 0xc7, 0xeb, 0x11, 0x71, 0xe2,
+	0x48, 0xf3, 0x45, 0x40, 0xde, 0xc4, 0x85, 0x2b, 0x57, 0x6e, 0xf3, 0x7e, 0x33, 0xda, 0x91, 0x46,
+	0x5a, 0xf6, 0x3c, 0x57, 0xae, 0x68, 0xce, 0x67, 0x92, 0xea, 0xb9, 0x24, 0x74, 0x99, 0x42, 0x30,
+	0xcb, 0x3f, 0x65, 0xa5, 0xb0, 0x69, 0xe7, 0xa6, 0x41, 0x49, 0xda, 0x59, 0x2f, 0x66, 0xda, 0x90,
+	0x23, 0x7e, 0xfc, 0x3b, 0x35, 0xf3, 0xa9, 0x59, 0x67, 0x9e, 0xdc, 0xce, 0x29, 0x27, 0x9f, 0x98,
+	0x77, 0x6a, 0x13, 0x9e, 0x94, 0x6c, 0x98, 0x36, 0x28, 0xdf, 0x6a, 0xa7, 0x08, 0x2d, 0x8f, 0xd9,
+	0xc0, 0x34, 0xe8, 0x54, 0x0d, 0x71, 0x30, 0x0e, 0xa6, 0x51, 0xda, 0x9f, 0xfc, 0x2e, 0x8b, 0xa4,
+	0x51, 0x8d, 0xd0, 0x99, 0x2b, 0xe2, 0x5d, 0xef, 0x85, 0x1d, 0x38, 0xcb, 0x5c, 0xc1, 0x1f, 0xb1,
+	0x23, 0xbb, 0xb2, 0x0e, 0xea, 0xa5, 0x90, 0xb9, 0xa1, 0x46, 0xc7, 0x7b, 0xe3, 0x60, 0x1a, 0xa6,
+	0xa3, 0x2d, 0x5d, 0x78, 0x38, 0xf9, 0xb6, 0xcb, 0x46, 0x0b, 0x03, 0x99, 0x83, 0xbe, 0x6f, 0xc2,
+	0x46, 0x48, 0x42, 0xab, 0xcf, 0xe4, 0x84, 0x21, 0x72, 0xbe, 0x35, 0x4c, 0x87, 0x48, 0x67, 0x1d,
+	0x4b, 0x89, 0x1c, 0xbf, 0xc3, 0x42, 0xd2, 0x80, 0xc2, 0x49, 0xed, 0x8b, 0xc3, 0x74, 0xd0, 0xdd,
+	0xef, 0xa5, 0xe6, 0x4f, 0xd8, 0x31, 0xb4, 0x0e, 0x0c, 0x66, 0x95, 0x68, 0x50, 0xb5, 0xc2, 0x92,
+	0x2c, 0xc1, 0xd9, 0x6d, 0xfd, 0xad, 0xde, 0xfc, 0x80, 0xaa, 0x7d, 0xb7, 0xb1, 0xf8, 0x09, 0x0b,
+	0x1d, 0x98, 0x5a, 0x61, 0x56, 0xc5, 0xfb, 0x3e, 0x76, 0x7d, 0xf3, 0x7b, 0x8c, 0x7d, 0x52, 0x15,
+	0x88, 0x8a, 0x64, 0x69, 0xe3, 0xff, 0xbc, 0x1b, 0x75, 0xe4, 0x75, 0x07, 0xf8, 0x63, 0x76, 0x03,
+	0x6a, 0xed, 0x56, 0x02, 0xb3, 0x1a, 0xac, 0xce, 0x24, 0xd8, 0xf8, 0x60, 0xbc, 0x37, 0x8d, 0xd2,
+	0xff, 0x3d, 0x3f, 0xbd, 0xc6, 0xfc, 0x01, 0x3b, 0xdc, 0x2c, 0x61, 0x45, 0x4d, 0x4b, 0x88, 0x07,
+	0x7e, 0xb1, 0xe1, 0x96, 0xbd, 0xa1, 0x25, 0xf0, 0x87, 0xec, 0x08, 0x49, 0x20, 0x5c, 0x88, 0x12,
+	0x56, 0x46, 0x61, 0x1e, 0x87, 0xbe, 0xf0, 0x10, 0xe9, 0x14, 0x2e, 0x5e, 0x6d, 0x18, 0xbf, 0xcf,
+	0x86, 0xb6, 0x50, 0x75, 0xbf, 0x6b, 0xe4, 0xdf, 0x61, 0x1d, 0xda, 0x8e, 0xfa, 0x33, 0x60, 0x37,
+	0x17, 0x05, 0xc8, 0x52, 0x93, 0x42, 0xd7, 0x0f, 0xcb, 0xd9, 0x3e, 0xb4, 0xaa, 0xdf, 0xd3, 0xeb,
+	0x7f, 0x75, 0xc8, 0x97, 0xe9, 0xe5, 0x55, 0xb2, 0xf3, 0xfd, 0x2a, 0xd9, 0xf9, 0xb2, 0x4e, 0x82,
+	0xcb, 0x75, 0x12, 0x7c, 0x5d, 0x27, 0xc1, 0x8f, 0x75, 0x12, 0x7c, 0x7c, 0xf6, 0x97, 0xdf, 0xe8,
+	0x45, 0x2f, 0xce, 0x0f, 0xfc, 0xf7, 0x78, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x85, 0x79,
+	0xc9, 0x89, 0x03, 0x00, 0x00,
 }