runtime: deprecate runc --criu / -criu-path option
runc option --criu is now ignored (with a warning), and the option will be removed entirely in a future release. Users who need a non- standard criu binary should rely on the standard way of looking up binaries in $PATH. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
@@ -23,6 +23,9 @@ file {
|
||||
number: 3
|
||||
label: LABEL_OPTIONAL
|
||||
type: TYPE_STRING
|
||||
options {
|
||||
deprecated: true
|
||||
}
|
||||
json_name: "criuPath"
|
||||
}
|
||||
field {
|
||||
|
||||
@@ -26,9 +26,15 @@ var _ = math.Inf
|
||||
const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
|
||||
|
||||
type RuncOptions struct {
|
||||
Runtime string `protobuf:"bytes,1,opt,name=runtime,proto3" json:"runtime,omitempty"`
|
||||
RuntimeRoot string `protobuf:"bytes,2,opt,name=runtime_root,json=runtimeRoot,proto3" json:"runtime_root,omitempty"`
|
||||
CriuPath string `protobuf:"bytes,3,opt,name=criu_path,json=criuPath,proto3" json:"criu_path,omitempty"`
|
||||
Runtime string `protobuf:"bytes,1,opt,name=runtime,proto3" json:"runtime,omitempty"`
|
||||
RuntimeRoot string `protobuf:"bytes,2,opt,name=runtime_root,json=runtimeRoot,proto3" json:"runtime_root,omitempty"`
|
||||
// criu binary path.
|
||||
//
|
||||
// Deprecated: runc option --criu is now ignored (with a warning), and the
|
||||
// option will be removed entirely in a future release. Users who need a non-
|
||||
// standard criu binary should rely on the standard way of looking up binaries
|
||||
// in $PATH.
|
||||
CriuPath string `protobuf:"bytes,3,opt,name=criu_path,json=criuPath,proto3" json:"criu_path,omitempty"` // Deprecated: Do not use.
|
||||
SystemdCgroup bool `protobuf:"varint,4,opt,name=systemd_cgroup,json=systemdCgroup,proto3" json:"systemd_cgroup,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
@@ -216,45 +222,45 @@ func init() {
|
||||
}
|
||||
|
||||
var fileDescriptor_d20e2ba8b3cc58b9 = []byte{
|
||||
// 605 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x94, 0xcf, 0x6e, 0xd3, 0x4a,
|
||||
0x14, 0xc6, 0xeb, 0xfe, 0x49, 0x9c, 0x93, 0xa4, 0xbd, 0x77, 0xee, 0xad, 0xe4, 0xdb, 0xaa, 0x69,
|
||||
0x6e, 0xf8, 0xa3, 0xb0, 0x49, 0x25, 0x10, 0x2b, 0x76, 0x4d, 0x11, 0xaa, 0x80, 0x52, 0x19, 0x2a,
|
||||
0x24, 0x84, 0x34, 0x72, 0xc7, 0x87, 0x64, 0x94, 0x78, 0x8e, 0xe5, 0x19, 0x93, 0x64, 0xc7, 0x13,
|
||||
0xf0, 0x42, 0xbc, 0x40, 0x57, 0x88, 0x25, 0x2b, 0x44, 0xf3, 0x24, 0x68, 0xc6, 0x76, 0xda, 0x35,
|
||||
0x4b, 0x76, 0xe7, 0xfc, 0xce, 0x67, 0x9f, 0xa3, 0xef, 0x93, 0x0d, 0xc3, 0x91, 0x34, 0xe3, 0xfc,
|
||||
0x72, 0x20, 0x28, 0x39, 0x12, 0xa4, 0x4c, 0x24, 0x15, 0x66, 0xf1, 0xed, 0x32, 0xcb, 0x95, 0x91,
|
||||
0x09, 0x1e, 0x4d, 0xa5, 0xca, 0xe7, 0xb6, 0x13, 0x66, 0x91, 0xa2, 0x76, 0xd5, 0x20, 0xcd, 0xc8,
|
||||
0x10, 0xdb, 0xbd, 0x91, 0x0f, 0x9c, 0x6c, 0x60, 0x87, 0x7b, 0xff, 0x8e, 0x68, 0x44, 0x4e, 0x71,
|
||||
0x64, 0xab, 0x42, 0xdc, 0xfb, 0xec, 0x41, 0x33, 0xcc, 0x95, 0x78, 0x95, 0x1a, 0x49, 0x4a, 0xb3,
|
||||
0x00, 0xea, 0xe5, 0x8a, 0xc0, 0xeb, 0x7a, 0xfd, 0x46, 0x58, 0xb5, 0xec, 0x7f, 0x68, 0x95, 0x25,
|
||||
0xcf, 0x88, 0x4c, 0xb0, 0xee, 0xc6, 0xcd, 0x92, 0x85, 0x44, 0x86, 0xed, 0x43, 0x43, 0x64, 0x32,
|
||||
0xe7, 0x69, 0x64, 0xc6, 0xc1, 0x86, 0x9b, 0xfb, 0x16, 0x9c, 0x47, 0x66, 0xcc, 0xee, 0xc1, 0xb6,
|
||||
0x5e, 0x68, 0x83, 0x49, 0xcc, 0xc5, 0x28, 0xa3, 0x3c, 0x0d, 0x36, 0xbb, 0x5e, 0xdf, 0x0f, 0xdb,
|
||||
0x25, 0x1d, 0x3a, 0xd8, 0xfb, 0xba, 0x01, 0xed, 0x61, 0x86, 0x91, 0xc1, 0xea, 0xa4, 0x1e, 0xb4,
|
||||
0x15, 0xf1, 0x54, 0x7e, 0x24, 0x53, 0x6c, 0xf6, 0xdc, 0x73, 0x4d, 0x45, 0xe7, 0x96, 0xb9, 0xcd,
|
||||
0xff, 0x81, 0x4f, 0x29, 0x2a, 0x6e, 0x44, 0xea, 0x0e, 0xf3, 0xc3, 0xba, 0xed, 0xdf, 0x88, 0x94,
|
||||
0x3d, 0x84, 0x5d, 0x9c, 0x1b, 0xcc, 0x54, 0x34, 0xe5, 0xb9, 0x92, 0x73, 0xae, 0x49, 0x4c, 0xd0,
|
||||
0x68, 0x77, 0xa0, 0x1f, 0xfe, 0x53, 0x0d, 0x2f, 0x94, 0x9c, 0xbf, 0x2e, 0x46, 0x6c, 0x0f, 0x7c,
|
||||
0x83, 0x59, 0x22, 0x55, 0x34, 0x2d, 0xaf, 0x5c, 0xf5, 0xec, 0x00, 0xe0, 0x83, 0x9c, 0x22, 0x9f,
|
||||
0x92, 0x98, 0xe8, 0x60, 0xcb, 0x4d, 0x1b, 0x96, 0xbc, 0xb0, 0x80, 0x3d, 0x80, 0xbf, 0x30, 0x49,
|
||||
0xcd, 0x82, 0xab, 0x28, 0x41, 0x9d, 0x46, 0x02, 0x75, 0x50, 0xeb, 0x6e, 0xf4, 0x1b, 0xe1, 0x8e,
|
||||
0xe3, 0x67, 0x2b, 0x6c, 0x1d, 0x2d, 0x9c, 0xd0, 0x3c, 0xa1, 0x18, 0x83, 0x7a, 0xe1, 0x68, 0xc9,
|
||||
0x5e, 0x52, 0x8c, 0xec, 0x2e, 0x6c, 0x2b, 0xe2, 0x0a, 0x67, 0x7c, 0x82, 0x8b, 0x4c, 0xaa, 0x51,
|
||||
0xe0, 0xbb, 0x85, 0x2d, 0x45, 0x67, 0x38, 0x7b, 0x5e, 0x30, 0x76, 0x08, 0x4d, 0x3d, 0x96, 0x49,
|
||||
0xe5, 0x6b, 0xc3, 0xbd, 0x07, 0x2c, 0x2a, 0x4c, 0x65, 0xbb, 0x50, 0x93, 0xc4, 0x73, 0x19, 0x07,
|
||||
0xd0, 0xf5, 0xfa, 0xed, 0x70, 0x4b, 0xd2, 0x85, 0x8c, 0x4b, 0x3c, 0x92, 0x71, 0xd0, 0xac, 0xf0,
|
||||
0x33, 0x19, 0xdb, 0xa5, 0x2e, 0xc6, 0x19, 0x65, 0x93, 0x22, 0xcb, 0x96, 0x7b, 0x63, 0xcb, 0xd2,
|
||||
0xb7, 0x94, 0x4d, 0x5c, 0x9e, 0xf7, 0x61, 0xc7, 0xa9, 0x64, 0x12, 0x8d, 0xb0, 0x90, 0xb5, 0x9d,
|
||||
0xac, 0x6d, 0xf1, 0xa9, 0xa5, 0x56, 0xd7, 0xfb, 0xb2, 0x0e, 0x7f, 0x0f, 0xc7, 0x28, 0x26, 0x29,
|
||||
0x49, 0x65, 0xaa, 0x50, 0x19, 0x6c, 0xe2, 0x5c, 0x56, 0x59, 0xba, 0xfa, 0x8f, 0x0d, 0x71, 0x1f,
|
||||
0x1a, 0x37, 0x56, 0xfa, 0xc5, 0x67, 0x31, 0xab, 0x6c, 0x3c, 0x00, 0xb8, 0xe5, 0x60, 0x11, 0x5d,
|
||||
0x43, 0xae, 0xdc, 0x7b, 0x0c, 0xdb, 0xe7, 0x19, 0x09, 0xd4, 0xfa, 0x04, 0x4d, 0x24, 0xa7, 0x9a,
|
||||
0xdd, 0x81, 0x3a, 0xce, 0x51, 0x70, 0x19, 0x17, 0x5f, 0xe8, 0x31, 0x2c, 0x7f, 0x1c, 0xd6, 0x9e,
|
||||
0xce, 0x51, 0x9c, 0x9e, 0x84, 0x35, 0x3b, 0x3a, 0x8d, 0x8f, 0xdf, 0x5f, 0x5d, 0x77, 0xd6, 0xbe,
|
||||
0x5f, 0x77, 0xd6, 0x3e, 0x2d, 0x3b, 0xde, 0xd5, 0xb2, 0xe3, 0x7d, 0x5b, 0x76, 0xbc, 0x9f, 0xcb,
|
||||
0x8e, 0xf7, 0xee, 0xf8, 0x77, 0x7f, 0x31, 0x4f, 0x56, 0xd5, 0x65, 0xcd, 0xfd, 0x3b, 0x1e, 0xfd,
|
||||
0x0a, 0x00, 0x00, 0xff, 0xff, 0x72, 0x8a, 0x0a, 0x26, 0xaf, 0x04, 0x00, 0x00,
|
||||
// 606 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
|
||||
0x10, 0xc6, 0xeb, 0xfe, 0x49, 0x9c, 0x49, 0xd2, 0xc2, 0x42, 0x25, 0x53, 0xd4, 0x34, 0x84, 0x3f,
|
||||
0x0a, 0x97, 0x54, 0x02, 0x71, 0xe2, 0x96, 0x14, 0xa1, 0x0a, 0x28, 0x95, 0xa1, 0x42, 0x42, 0x48,
|
||||
0x2b, 0x77, 0x3d, 0x24, 0xab, 0xc4, 0x3b, 0x96, 0x77, 0x4d, 0x92, 0x1b, 0xcf, 0xc0, 0xeb, 0xf0,
|
||||
0x02, 0x3d, 0x21, 0x8e, 0x9c, 0x10, 0xcd, 0x93, 0xa0, 0x5d, 0xc7, 0x69, 0xcf, 0x1c, 0xb9, 0xcd,
|
||||
0xfc, 0xbe, 0x2f, 0x9e, 0xd1, 0x37, 0xca, 0xc2, 0x60, 0x28, 0xcd, 0x28, 0x3f, 0xef, 0x09, 0x4a,
|
||||
0x0e, 0x05, 0x29, 0x13, 0x49, 0x85, 0x59, 0x7c, 0xbd, 0xcc, 0x72, 0x65, 0x64, 0x82, 0x87, 0x13,
|
||||
0xa9, 0xf2, 0x99, 0xed, 0x84, 0x99, 0xa7, 0xa8, 0x5d, 0xd5, 0x4b, 0x33, 0x32, 0xc4, 0x76, 0xaf,
|
||||
0xec, 0x3d, 0x67, 0xeb, 0x59, 0x71, 0xef, 0xf6, 0x90, 0x86, 0xe4, 0x1c, 0x87, 0xb6, 0x2a, 0xcc,
|
||||
0x9d, 0x6f, 0x1e, 0xd4, 0xc3, 0x5c, 0x89, 0xb7, 0xa9, 0x91, 0xa4, 0x34, 0x0b, 0xa0, 0xba, 0x1c,
|
||||
0x11, 0x78, 0x6d, 0xaf, 0x5b, 0x0b, 0xcb, 0x96, 0xdd, 0x83, 0xc6, 0xb2, 0xe4, 0x19, 0x91, 0x09,
|
||||
0xd6, 0x9d, 0x5c, 0x5f, 0xb2, 0x90, 0xc8, 0xb0, 0x03, 0xa8, 0x89, 0x4c, 0xe6, 0x3c, 0x8d, 0xcc,
|
||||
0x28, 0xd8, 0xb0, 0x7a, 0x7f, 0x3d, 0xf0, 0x42, 0xdf, 0xc2, 0xd3, 0xc8, 0x8c, 0xd8, 0x43, 0xd8,
|
||||
0xd6, 0x73, 0x6d, 0x30, 0x89, 0xb9, 0x18, 0x66, 0x94, 0xa7, 0xc1, 0x66, 0xdb, 0xeb, 0xfa, 0x61,
|
||||
0x73, 0x49, 0x07, 0x0e, 0x76, 0x7e, 0x6c, 0x40, 0x73, 0x90, 0x61, 0x64, 0xb0, 0x5c, 0xab, 0x03,
|
||||
0x4d, 0x45, 0x3c, 0x95, 0x5f, 0xc8, 0x14, 0xd3, 0x3d, 0xf7, 0xbb, 0xba, 0xa2, 0x53, 0xcb, 0xdc,
|
||||
0xf4, 0x3b, 0xe0, 0x53, 0x8a, 0x8a, 0x1b, 0x91, 0xba, 0xe5, 0xfc, 0xb0, 0x6a, 0xfb, 0xf7, 0x22,
|
||||
0x65, 0x4f, 0x60, 0x17, 0x67, 0x06, 0x33, 0x15, 0x4d, 0x78, 0xae, 0xe4, 0x8c, 0x6b, 0x12, 0x63,
|
||||
0x34, 0xda, 0x2d, 0xe9, 0x87, 0xb7, 0x4a, 0xf1, 0x4c, 0xc9, 0xd9, 0xbb, 0x42, 0x62, 0x7b, 0xe0,
|
||||
0x1b, 0xcc, 0x12, 0xa9, 0xa2, 0xc9, 0x72, 0xcb, 0x55, 0xcf, 0xf6, 0x01, 0x3e, 0xcb, 0x09, 0xf2,
|
||||
0x09, 0x89, 0xb1, 0x0e, 0xb6, 0x9c, 0x5a, 0xb3, 0xe4, 0xb5, 0x05, 0xec, 0x31, 0xdc, 0xc0, 0x24,
|
||||
0x35, 0x73, 0xae, 0xa2, 0x04, 0x75, 0x1a, 0x09, 0xd4, 0x41, 0xa5, 0xbd, 0xd1, 0xad, 0x85, 0x3b,
|
||||
0x8e, 0x9f, 0xac, 0xb0, 0x4d, 0xb5, 0x48, 0x42, 0xf3, 0x84, 0x62, 0x0c, 0xaa, 0x45, 0xaa, 0x4b,
|
||||
0xf6, 0x86, 0x62, 0x64, 0x0f, 0x60, 0x5b, 0x11, 0x57, 0x38, 0xe5, 0x63, 0x9c, 0x67, 0x52, 0x0d,
|
||||
0x03, 0xdf, 0x0d, 0x6c, 0x28, 0x3a, 0xc1, 0xe9, 0xab, 0x82, 0xb1, 0x03, 0xa8, 0xeb, 0x91, 0x4c,
|
||||
0xca, 0x5c, 0x6b, 0xee, 0x3b, 0x60, 0x51, 0x11, 0x2a, 0xdb, 0x85, 0x8a, 0x24, 0x9e, 0xcb, 0x38,
|
||||
0x80, 0xb6, 0xd7, 0x6d, 0x86, 0x5b, 0x92, 0xce, 0x64, 0xbc, 0xc4, 0x43, 0x19, 0x07, 0xf5, 0x12,
|
||||
0xbf, 0x94, 0xb1, 0x1d, 0xea, 0x4e, 0x39, 0xa5, 0x6c, 0x5c, 0xdc, 0xb3, 0xe1, 0xbe, 0xd8, 0xb0,
|
||||
0xf4, 0x03, 0x65, 0x63, 0x77, 0xcf, 0x47, 0xb0, 0xe3, 0x5c, 0x32, 0x89, 0x86, 0x58, 0xd8, 0x9a,
|
||||
0xce, 0xd6, 0xb4, 0xf8, 0xd8, 0x52, 0xeb, 0xeb, 0x7c, 0x5f, 0x87, 0x9b, 0x83, 0x11, 0x8a, 0x71,
|
||||
0x4a, 0x52, 0x99, 0xf2, 0xa8, 0x0c, 0x36, 0x71, 0x26, 0xcb, 0x5b, 0xba, 0xfa, 0xbf, 0x3d, 0xe2,
|
||||
0x5d, 0xa8, 0x5d, 0x45, 0xe9, 0x3b, 0xdd, 0x9f, 0x96, 0x31, 0xee, 0x03, 0x5c, 0x4b, 0xb0, 0x38,
|
||||
0x5d, 0x4d, 0xae, 0xd2, 0x7b, 0x06, 0xdb, 0xa7, 0x19, 0x09, 0xd4, 0xfa, 0x08, 0x4d, 0x24, 0x27,
|
||||
0x9a, 0xdd, 0x87, 0x2a, 0xce, 0x50, 0x70, 0x19, 0x17, 0xff, 0xd2, 0x3e, 0x2c, 0x7e, 0x1f, 0x54,
|
||||
0x5e, 0xcc, 0x50, 0x1c, 0x1f, 0x85, 0x15, 0x2b, 0x1d, 0xc7, 0xfd, 0x4f, 0x17, 0x97, 0xad, 0xb5,
|
||||
0x5f, 0x97, 0xad, 0xb5, 0xaf, 0x8b, 0x96, 0x77, 0xb1, 0x68, 0x79, 0x3f, 0x17, 0x2d, 0xef, 0xcf,
|
||||
0xa2, 0xe5, 0x7d, 0xec, 0xff, 0xeb, 0x33, 0xf3, 0x7c, 0x55, 0x9d, 0x57, 0xdc, 0xfb, 0xf1, 0xf4,
|
||||
0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xbd, 0xd4, 0x57, 0xb3, 0x04, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func (m *RuncOptions) Marshal() (dAtA []byte, err error) {
|
||||
|
||||
@@ -9,7 +9,13 @@ option go_package = "github.com/containerd/containerd/runtime/linux/runctypes;ru
|
||||
message RuncOptions {
|
||||
string runtime = 1;
|
||||
string runtime_root = 2;
|
||||
string criu_path = 3;
|
||||
// criu binary path.
|
||||
//
|
||||
// Deprecated: runc option --criu is now ignored (with a warning), and the
|
||||
// option will be removed entirely in a future release. Users who need a non-
|
||||
// standard criu binary should rely on the standard way of looking up binaries
|
||||
// in $PATH.
|
||||
string criu_path = 3 [deprecated = true];
|
||||
bool systemd_cgroup = 4;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user