github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128687 from tallclair/allocated-status

Browse Source 
[FG:InPlacePodVerticalScaling] Fix AllocatedResources feature gate annotation
This commit is contained in:
Kubernetes Prow Robot
2024-11-08 04:12:49 +00:00
committed by GitHub
parent 4d91d50283 8661f743a3
commit 3232e2ffc0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/core/types.go
View File

@@ -2811,7 +2811,7 @@ type ContainerStatus struct {
// AllocatedResources 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 // node. Kubelet sets this value to Container.Resources.Requests upon successful pod admission
// and after successfully admitting desired pod resize. // and after successfully admitting desired pod resize.
// +featureGate=InPlacePodVerticalScaling // +featureGate=InPlacePodVerticalScalingAllocatedStatus
// +optional // +optional
AllocatedResources ResourceList AllocatedResources ResourceList
// Resources represents the compute resource requests and limits that have been successfully // Resources represents the compute resource requests and limits that have been successfully

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

@@ -1070,7 +1070,7 @@ message ContainerStatus {
// AllocatedResources 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 // node. Kubelet sets this value to Container.Resources.Requests upon successful pod admission
// and after successfully admitting desired pod resize. // and after successfully admitting desired pod resize.
// +featureGate=InPlacePodVerticalScaling // +featureGate=InPlacePodVerticalScalingAllocatedStatus
// +optional // +optional
map<string, .k8s.io.apimachinery.pkg.api.resource.Quantity> allocatedResources = 10; map<string, .k8s.io.apimachinery.pkg.api.resource.Quantity> allocatedResources = 10;

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

@@ -3119,7 +3119,7 @@ type ContainerStatus struct {
// AllocatedResources 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 // node. Kubelet sets this value to Container.Resources.Requests upon successful pod admission
// and after successfully admitting desired pod resize. // and after successfully admitting desired pod resize.
// +featureGate=InPlacePodVerticalScaling // +featureGate=InPlacePodVerticalScalingAllocatedStatus
// +optional // +optional
AllocatedResources ResourceList `json:"allocatedResources,omitempty" protobuf:"bytes,10,rep,name=allocatedResources,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 // Resources represents the compute resource requests and limits that have been successfully