github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116450 from vinaykul/restart-free-pod-vertical-scaling-api

Browse Source 
Rename ContainerStatus.ResourcesAllocated to ContainerStatus.AllocatedResources
This commit is contained in:
Kubernetes Prow Robot
2023-03-12 16:06:40 -07:00
committed by GitHub
parent a32050e6cb d011cc4d87
commit 3c6e419cc3
40 changed files with 909 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1491
staging/src/k8s.io/api/core/v1/generated.pb.go generated
View File

File diff suppressed because it is too large Load Diff

4
staging/src/k8s.io/api/core/v1/generated.proto
View File

@@ -1004,12 +1004,12 @@ message ContainerStatus {
// +optional
optional bool started = 9;
// ResourcesAllocated represents the compute resources allocated for this container by the
// AllocatedResources represents the compute resources allocated for this container by the
// node. Kubelet sets this value to Container.Resources.Requests upon successful pod admission
// and after successfully admitting desired pod resize.
// +featureGate=InPlacePodVerticalScaling
// +optional
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> resourcesAllocated = 10;
map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> allocatedResources = 10;
// Resources represents the compute resource requests and limits that have been successfully
// enacted on the running container after it has been started or has been successfully resized.

4
staging/src/k8s.io/api/core/v1/types.go
View File

@@ -2710,12 +2710,12 @@ type ContainerStatus struct {
// same as false.
// +optional
Started *bool `json:"started,omitempty" protobuf:"varint,9,opt,name=started"`
// ResourcesAllocated represents the compute resources allocated for this container by the
// AllocatedResources represents the compute resources allocated for this container by the
// node. Kubelet sets this value to Container.Resources.Requests upon successful pod admission
// and after successfully admitting desired pod resize.
// +featureGate=InPlacePodVerticalScaling
// +optional
ResourcesAllocated ResourceList `json:"resourcesAllocated,omitempty" protobuf:"bytes,10,rep,name=resourcesAllocated,casttype=ResourceList,castkey=ResourceName"`
AllocatedResources ResourceList `json:"allocatedResources,omitempty" protobuf:"bytes,10,rep,name=allocatedResources,casttype=ResourceList,castkey=ResourceName"`
// Resources represents the compute resource requests and limits that have been successfully
// enacted on the running container after it has been started or has been successfully resized.
// +featureGate=InPlacePodVerticalScaling

2
staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go generated
View File

@@ -455,7 +455,7 @@ var map_ContainerStatus = map[string]string{
"imageID": "ImageID is the image ID of the container's image. The image ID may not match the image ID of the image used in the PodSpec, as it may have been resolved by the runtime.",
"containerID": "ContainerID is the ID of the container in the format '<type>://<container_id>'. Where type is a container runtime identifier, returned from Version call of CRI API (for example \"containerd\").",
"started": "Started indicates whether the container has finished its postStart lifecycle hook and 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. In both cases, startup probes will run again. Is always true when no startupProbe is defined and container is running and has passed the postStart lifecycle hook. The null value must be treated the same as false.",
"resourcesAllocated": "ResourcesAllocated represents the compute resources allocated for this container by the node. Kubelet sets this value to Container.Resources.Requests upon successful pod admission and after successfully admitting desired pod resize.",
"allocatedResources": "AllocatedResources represents the compute resources allocated for this container by the node. Kubelet sets this value to Container.Resources.Requests upon successful pod admission and after successfully admitting desired pod resize.",
"resources": "Resources represents the compute resource requests and limits that have been successfully enacted on the running container after it has been started or has been successfully resized.",
}

4
staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go generated
View File

@@ -988,8 +988,8 @@ func (in *ContainerStatus) DeepCopyInto(out *ContainerStatus) {
*out = new(bool)
**out = **in
}
if in.ResourcesAllocated != nil {
in, out := &in.ResourcesAllocated, &out.ResourcesAllocated
if in.AllocatedResources != nil {
in, out := &in.AllocatedResources, &out.AllocatedResources
*out = make(ResourceList, len(*in))
for key, val := range *in {
(*out)[key] = val.DeepCopy()

12
staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.json vendored
View File

@@ -1691,8 +1691,8 @@
"imageID": "imageIDValue",
"containerID": "containerIDValue",
"started": true,
"resourcesAllocated": {
"resourcesAllocatedKey": "0"
"allocatedResources": {
"allocatedResourcesKey": "0"
},
"resources": {
"limits": {
@@ -1754,8 +1754,8 @@
"imageID": "imageIDValue",
"containerID": "containerIDValue",
"started": true,
"resourcesAllocated": {
"resourcesAllocatedKey": "0"
"allocatedResources": {
"allocatedResourcesKey": "0"
},
"resources": {
"limits": {
@@ -1818,8 +1818,8 @@
"imageID": "imageIDValue",
"containerID": "containerIDValue",
"started": true,
"resourcesAllocated": {
"resourcesAllocatedKey": "0"
"allocatedResources": {
"allocatedResourcesKey": "0"
},
"resources": {
"limits": {

BIN
staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.pb vendored
View File

Binary file not shown.

18
staging/src/k8s.io/api/testdata/HEAD/core.v1.Pod.yaml vendored
View File

@@ -1115,7 +1115,9 @@ status:
status: statusValue
type: typeValue
containerStatuses:
- containerID: containerIDValue
- allocatedResources:
allocatedResourcesKey: "0"
containerID: containerIDValue
image: imageValue
imageID: imageIDValue
lastState:
@@ -1141,8 +1143,6 @@ status:
limitsKey: "0"
requests:
requestsKey: "0"
resourcesAllocated:
resourcesAllocatedKey: "0"
restartCount: 5
started: true
state:
@@ -1160,7 +1160,9 @@ status:
message: messageValue
reason: reasonValue
ephemeralContainerStatuses:
- containerID: containerIDValue
- allocatedResources:
allocatedResourcesKey: "0"
containerID: containerIDValue
image: imageValue
imageID: imageIDValue
lastState:
@@ -1186,8 +1188,6 @@ status:
limitsKey: "0"
requests:
requestsKey: "0"
resourcesAllocated:
resourcesAllocatedKey: "0"
restartCount: 5
started: true
state:
@@ -1206,7 +1206,9 @@ status:
reason: reasonValue
hostIP: hostIPValue
initContainerStatuses:
- containerID: containerIDValue
- allocatedResources:
allocatedResourcesKey: "0"
containerID: containerIDValue
image: imageValue
imageID: imageIDValue
lastState:
@@ -1232,8 +1234,6 @@ status:
limitsKey: "0"
requests:
requestsKey: "0"
resourcesAllocated:
resourcesAllocatedKey: "0"
restartCount: 5
started: true
state:

12
staging/src/k8s.io/api/testdata/HEAD/core.v1.PodStatusResult.json vendored
View File

@@ -111,8 +111,8 @@
"imageID": "imageIDValue",
"containerID": "containerIDValue",
"started": true,
"resourcesAllocated": {
"resourcesAllocatedKey": "0"
"allocatedResources": {
"allocatedResourcesKey": "0"
},
"resources": {
"limits": {
@@ -174,8 +174,8 @@
"imageID": "imageIDValue",
"containerID": "containerIDValue",
"started": true,
"resourcesAllocated": {
"resourcesAllocatedKey": "0"
"allocatedResources": {
"allocatedResourcesKey": "0"
},
"resources": {
"limits": {
@@ -238,8 +238,8 @@
"imageID": "imageIDValue",
"containerID": "containerIDValue",
"started": true,
"resourcesAllocated": {
"resourcesAllocatedKey": "0"
"allocatedResources": {
"allocatedResourcesKey": "0"
},
"resources": {
"limits": {

BIN
staging/src/k8s.io/api/testdata/HEAD/core.v1.PodStatusResult.pb vendored
View File

Binary file not shown.

18
staging/src/k8s.io/api/testdata/HEAD/core.v1.PodStatusResult.yaml vendored
View File

@@ -41,7 +41,9 @@ status:
status: statusValue
type: typeValue
containerStatuses:
- containerID: containerIDValue
- allocatedResources:
allocatedResourcesKey: "0"
containerID: containerIDValue
image: imageValue
imageID: imageIDValue
lastState:
@@ -67,8 +69,6 @@ status:
limitsKey: "0"
requests:
requestsKey: "0"
resourcesAllocated:
resourcesAllocatedKey: "0"
restartCount: 5
started: true
state:
@@ -86,7 +86,9 @@ status:
message: messageValue
reason: reasonValue
ephemeralContainerStatuses:
- containerID: containerIDValue
- allocatedResources:
allocatedResourcesKey: "0"
containerID: containerIDValue
image: imageValue
imageID: imageIDValue
lastState:
@@ -112,8 +114,6 @@ status:
limitsKey: "0"
requests:
requestsKey: "0"
resourcesAllocated:
resourcesAllocatedKey: "0"
restartCount: 5
started: true
state:
@@ -132,7 +132,9 @@ status:
reason: reasonValue
hostIP: hostIPValue
initContainerStatuses:
- containerID: containerIDValue
- allocatedResources:
allocatedResourcesKey: "0"
containerID: containerIDValue
image: imageValue
imageID: imageIDValue
lastState:
@@ -158,8 +160,6 @@ status:
limitsKey: "0"
requests:
requestsKey: "0"
resourcesAllocated:
resourcesAllocatedKey: "0"
restartCount: 5
started: true
state:

10
staging/src/k8s.io/client-go/applyconfigurations/core/v1/containerstatus.go
View File

@@ -34,7 +34,7 @@ type ContainerStatusApplyConfiguration struct {
ImageID *string `json:"imageID,omitempty"`
ContainerID *string `json:"containerID,omitempty"`
Started *bool `json:"started,omitempty"`
ResourcesAllocated *corev1.ResourceList `json:"resourcesAllocated,omitempty"`
AllocatedResources *corev1.ResourceList `json:"allocatedResources,omitempty"`
Resources *ResourceRequirementsApplyConfiguration `json:"resources,omitempty"`
}
@@ -116,11 +116,11 @@ func (b *ContainerStatusApplyConfiguration) WithStarted(value bool) *ContainerSt
return b
}
// WithResourcesAllocated sets the ResourcesAllocated field in the declarative configuration to the given value
// WithAllocatedResources sets the AllocatedResources field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the ResourcesAllocated field is set to the value of the last call.
func (b *ContainerStatusApplyConfiguration) WithResourcesAllocated(value corev1.ResourceList) *ContainerStatusApplyConfiguration {
b.ResourcesAllocated = &value
// If called multiple times, the AllocatedResources field is set to the value of the last call.
func (b *ContainerStatusApplyConfiguration) WithAllocatedResources(value corev1.ResourceList) *ContainerStatusApplyConfiguration {
b.AllocatedResources = &value
return b
}

10
staging/src/k8s.io/client-go/applyconfigurations/internal/internal.go
View File

@@ -4303,6 +4303,11 @@ var schemaYAML = typed.YAMLObject(`types:
- name: io.k8s.api.core.v1.ContainerStatus
map:
fields:
- name: allocatedResources
type:
map:
elementType:
namedType: io.k8s.apimachinery.pkg.api.resource.Quantity
- name: containerID
type:
scalar: string
@@ -4329,11 +4334,6 @@ var schemaYAML = typed.YAMLObject(`types:
- name: resources
type:
namedType: io.k8s.api.core.v1.ResourceRequirements
- name: resourcesAllocated
type:
map:
elementType:
namedType: io.k8s.apimachinery.pkg.api.resource.Quantity
- name: restartCount
type:
scalar: numeric