TODO comment should have been removed with #2912, the restartCount docs wasn't updated as part of #6794.

This commit is contained in:
Sergey Kanzhelev 2021-07-19 19:00:21 +00:00
parent 33aba7ee02
commit ac09f7a8bd
4 changed files with 8 additions and 16 deletions

View File

@ -5118,7 +5118,7 @@
"type": "string" "type": "string"
}, },
"image": { "image": {
"description": "The image the container is running. More info: https://kubernetes.io/docs/concepts/containers/images", "description": "The image the container is running. More info: https://kubernetes.io/docs/concepts/containers/images.",
"type": "string" "type": "string"
}, },
"imageID": { "imageID": {
@ -5138,7 +5138,7 @@
"type": "boolean" "type": "boolean"
}, },
"restartCount": { "restartCount": {
"description": "The number of times the container has been restarted, currently based on the number of dead containers that have not yet been removed. Note that this is calculated from dead containers. But those containers are subject to garbage collection. This value will get capped at 5 by GC.", "description": "The number of times the container has been restarted.",
"format": "int32", "format": "int32",
"type": "integer" "type": "integer"
}, },

View File

@ -908,15 +908,11 @@ message ContainerStatus {
// Specifies whether the container has passed its readiness probe. // Specifies whether the container has passed its readiness probe.
optional bool ready = 4; optional bool ready = 4;
// The number of times the container has been restarted, currently based on // The number of times the container has been restarted.
// the number of dead containers that have not yet been removed.
// Note that this is calculated from dead containers. But those containers are subject to
// garbage collection. This value will get capped at 5 by GC.
optional int32 restartCount = 5; optional int32 restartCount = 5;
// The image the container is running. // The image the container is running.
// More info: https://kubernetes.io/docs/concepts/containers/images // More info: https://kubernetes.io/docs/concepts/containers/images.
// TODO(dchen1107): Which image the container is running with?
optional string image = 6; optional string image = 6;
// ImageID of the container's image. // ImageID of the container's image.

View File

@ -2506,14 +2506,10 @@ type ContainerStatus struct {
LastTerminationState ContainerState `json:"lastState,omitempty" protobuf:"bytes,3,opt,name=lastState"` LastTerminationState ContainerState `json:"lastState,omitempty" protobuf:"bytes,3,opt,name=lastState"`
// Specifies whether the container has passed its readiness probe. // Specifies whether the container has passed its readiness probe.
Ready bool `json:"ready" protobuf:"varint,4,opt,name=ready"` Ready bool `json:"ready" protobuf:"varint,4,opt,name=ready"`
// The number of times the container has been restarted, currently based on // The number of times the container has been restarted.
// the number of dead containers that have not yet been removed.
// Note that this is calculated from dead containers. But those containers are subject to
// garbage collection. This value will get capped at 5 by GC.
RestartCount int32 `json:"restartCount" protobuf:"varint,5,opt,name=restartCount"` RestartCount int32 `json:"restartCount" protobuf:"varint,5,opt,name=restartCount"`
// The image the container is running. // The image the container is running.
// More info: https://kubernetes.io/docs/concepts/containers/images // More info: https://kubernetes.io/docs/concepts/containers/images.
// TODO(dchen1107): Which image the container is running with?
Image string `json:"image" protobuf:"bytes,6,opt,name=image"` Image string `json:"image" protobuf:"bytes,6,opt,name=image"`
// ImageID of the container's image. // ImageID of the container's image.
ImageID string `json:"imageID" protobuf:"bytes,7,opt,name=imageID"` ImageID string `json:"imageID" protobuf:"bytes,7,opt,name=imageID"`

View File

@ -428,8 +428,8 @@ var map_ContainerStatus = map[string]string{
"state": "Details about the container's current condition.", "state": "Details about the container's current condition.",
"lastState": "Details about the container's last termination condition.", "lastState": "Details about the container's last termination condition.",
"ready": "Specifies whether the container has passed its readiness probe.", "ready": "Specifies whether the container has passed its readiness probe.",
"restartCount": "The number of times the container has been restarted, currently based on the number of dead containers that have not yet been removed. Note that this is calculated from dead containers. But those containers are subject to garbage collection. This value will get capped at 5 by GC.", "restartCount": "The number of times the container has been restarted.",
"image": "The image the container is running. More info: https://kubernetes.io/docs/concepts/containers/images", "image": "The image the container is running. More info: https://kubernetes.io/docs/concepts/containers/images.",
"imageID": "ImageID of the container's image.", "imageID": "ImageID of the container's image.",
"containerID": "Container's ID in the format 'docker://<container_id>'.", "containerID": "Container's ID in the format 'docker://<container_id>'.",
"started": "Specifies whether the container has passed its startup probe. Initialized as false, becomes true after startupProbe is considered successful. Resets to false when the container is restarted, or if kubelet loses state temporarily. Is always true when no startupProbe is defined.", "started": "Specifies whether the container has passed its startup probe. Initialized as false, becomes true after startupProbe is considered successful. Resets to false when the container is restarted, or if kubelet loses state temporarily. Is always true when no startupProbe is defined.",