Merge pull request #7731 from mxpv/cri

[Sandbox API] CRI status cleanup
This commit is contained in:
Derek McGowan
2022-12-01 13:43:13 -08:00
committed by GitHub
17 changed files with 671 additions and 465 deletions

View File

@@ -974,6 +974,13 @@ file {
type: TYPE_STRING
json_name: "sandboxId"
}
field {
name: "verbose"
number: 2
label: LABEL_OPTIONAL
type: TYPE_BOOL
json_name: "verbose"
}
}
message_type {
name: "SandboxStatusResponse"
@@ -999,15 +1006,24 @@ file {
json_name: "state"
}
field {
name: "exit_status"
name: "info"
number: 4
label: LABEL_REPEATED
type: TYPE_MESSAGE
type_name: ".containerd.runtime.sandbox.v1.SandboxStatusResponse.InfoEntry"
json_name: "info"
}
field {
name: "created_at"
number: 5
label: LABEL_OPTIONAL
type: TYPE_UINT32
json_name: "exitStatus"
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
json_name: "createdAt"
}
field {
name: "exited_at"
number: 5
number: 6
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
@@ -1015,12 +1031,32 @@ file {
}
field {
name: "extra"
number: 6
number: 7
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Any"
json_name: "extra"
}
nested_type {
name: "InfoEntry"
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
}
}
}
message_type {
name: "PingRequest"
@@ -4331,6 +4367,13 @@ file {
type: TYPE_STRING
json_name: "sandboxId"
}
field {
name: "verbose"
number: 2
label: LABEL_OPTIONAL
type: TYPE_BOOL
json_name: "verbose"
}
}
message_type {
name: "ControllerStatusResponse"
@@ -4356,15 +4399,24 @@ file {
json_name: "state"
}
field {
name: "exit_status"
name: "info"
number: 4
label: LABEL_REPEATED
type: TYPE_MESSAGE
type_name: ".containerd.services.sandbox.v1.ControllerStatusResponse.InfoEntry"
json_name: "info"
}
field {
name: "created_at"
number: 5
label: LABEL_OPTIONAL
type: TYPE_UINT32
json_name: "exitStatus"
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
json_name: "createdAt"
}
field {
name: "exited_at"
number: 5
number: 6
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Timestamp"
@@ -4372,12 +4424,32 @@ file {
}
field {
name: "extra"
number: 6
number: 7
label: LABEL_OPTIONAL
type: TYPE_MESSAGE
type_name: ".google.protobuf.Any"
json_name: "extra"
}
nested_type {
name: "InfoEntry"
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
}
}
}
message_type {
name: "ControllerDeleteRequest"