Skip to content

Commit f8e5e36

Browse files
k8s-publishing-botk8s-publishing-bot
committed
Merge pull request #128407 from ndixita/pod-level-resources
[PodLevelResources] Pod Level Resources Feature Alpha Kubernetes-commit: c25f5eefe4efda4c0d9561d06942cd3de3dfe2e4
2 parents 84e0db8 + 59e28a2 commit f8e5e36

File tree

64 files changed

+1539
-1030
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1539
-1030
lines changed

Diff for: ‎core/v1/generated.pb.go

+1,064-1,008
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎core/v1/generated.proto

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎core/v1/types.go

+14
Original file line numberDiff line numberDiff line change
@@ -4087,6 +4087,20 @@ type PodSpec struct {
40874087
// +featureGate=DynamicResourceAllocation
40884088
// +optional
40894089
ResourceClaims []PodResourceClaim `json:"resourceClaims,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name" protobuf:"bytes,39,rep,name=resourceClaims"`
4090+
// Resources is the total amount of CPU and Memory resources required by all
4091+
// containers in the pod. It supports specifying Requests and Limits for
4092+
// "cpu" and "memory" resource names only. ResourceClaims are not supported.
4093+
//
4094+
// This field enables fine-grained control over resource allocation for the
4095+
// entire pod, allowing resource sharing among containers in a pod.
4096+
// TODO: For beta graduation, expand this comment with a detailed explanation.
4097+
//
4098+
// This is an alpha field and requires enabling the PodLevelResources feature
4099+
// gate.
4100+
//
4101+
// +featureGate=PodLevelResources
4102+
// +optional
4103+
Resources *ResourceRequirements `json:"resources,omitempty" protobuf:"bytes,40,opt,name=resources"`
40904104
}
40914105

40924106
// PodResourceClaim references exactly one ResourceClaim, either directly

Diff for: ‎core/v1/types_swagger_doc_generated.go

+1
Original file line numberDiff line numberDiff line change
@@ -1837,6 +1837,7 @@ var map_PodSpec = map[string]string{
18371837
"hostUsers": "Use the host's user namespace. Optional: Default to true. If set to true or not present, the pod will be run in the host user namespace, useful for when the pod needs a feature only available to the host user namespace, such as loading a kernel module with CAP_SYS_MODULE. When set to false, a new userns is created for the pod. Setting false is useful for mitigating container breakout vulnerabilities even allowing users to run their containers as root without actually having root privileges on the host. This field is alpha-level and is only honored by servers that enable the UserNamespacesSupport feature.",
18381838
"schedulingGates": "SchedulingGates is an opaque list of values that if specified will block scheduling the pod. If schedulingGates is not empty, the pod will stay in the SchedulingGated state and the scheduler will not attempt to schedule the pod.\n\nSchedulingGates can only be set at pod creation time, and be removed only afterwards.",
18391839
"resourceClaims": "ResourceClaims defines which ResourceClaims must be allocated and reserved before the Pod is allowed to start. The resources will be made available to those containers which consume them by name.\n\nThis is an alpha field and requires enabling the DynamicResourceAllocation feature gate.\n\nThis field is immutable.",
1840+
"resources": "Resources is the total amount of CPU and Memory resources required by all containers in the pod. It supports specifying Requests and Limits for \"cpu\" and \"memory\" resource names only. ResourceClaims are not supported.\n\nThis field enables fine-grained control over resource allocation for the entire pod, allowing resource sharing among containers in a pod.\n\nThis is an alpha field and requires enabling the PodLevelResources feature gate.",
18401841
}
18411842

18421843
func (PodSpec) SwaggerDoc() map[string]string {

Diff for: ‎core/v1/zz_generated.deepcopy.go

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ godebug default=go1.23
88

99
require (
1010
github.com/gogo/protobuf v1.3.2
11-
k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba
11+
k8s.io/apimachinery v0.0.0-20240920213627-16af2ff33fbf
1212
)
1313

1414
require (

Diff for: ‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
8888
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
8989
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
9090
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
91-
k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba h1:ghB5Iygt6Ge8UyIwW7C1kJx4kP7AUTCL9Qg6GCsUUOY=
92-
k8s.io/apimachinery v0.0.0-20241108022104-96b97de8d6ba/go.mod h1:HqhdaJUgQqky29T1V0o2yFkt/pZqLFIDyn9Zi/8rxoY=
91+
k8s.io/apimachinery v0.0.0-20240920213627-16af2ff33fbf h1:ZRwu8YHh3bFbQU4NRvHB6fiovWLBouxY86wIcLd7sBA=
92+
k8s.io/apimachinery v0.0.0-20240920213627-16af2ff33fbf/go.mod h1:HqhdaJUgQqky29T1V0o2yFkt/pZqLFIDyn9Zi/8rxoY=
9393
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
9494
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
9595
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=

Diff for: ‎testdata/HEAD/apps.v1.DaemonSet.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,21 @@
17661766
"resourceClaimName": "resourceClaimNameValue",
17671767
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17681768
}
1769-
]
1769+
],
1770+
"resources": {
1771+
"limits": {
1772+
"limitsKey": "0"
1773+
},
1774+
"requests": {
1775+
"requestsKey": "0"
1776+
},
1777+
"claims": [
1778+
{
1779+
"name": "nameValue",
1780+
"request": "requestValue"
1781+
}
1782+
]
1783+
}
17701784
}
17711785
},
17721786
"updateStrategy": {

Diff for: ‎testdata/HEAD/apps.v1.DaemonSet.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1.DaemonSet.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,14 @@ spec:
864864
- name: nameValue
865865
resourceClaimName: resourceClaimNameValue
866866
resourceClaimTemplateName: resourceClaimTemplateNameValue
867+
resources:
868+
claims:
869+
- name: nameValue
870+
request: requestValue
871+
limits:
872+
limitsKey: "0"
873+
requests:
874+
requestsKey: "0"
867875
restartPolicy: restartPolicyValue
868876
runtimeClassName: runtimeClassNameValue
869877
schedulerName: schedulerNameValue

Diff for: ‎testdata/HEAD/apps.v1.Deployment.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,21 @@
17671767
"resourceClaimName": "resourceClaimNameValue",
17681768
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17691769
}
1770-
]
1770+
],
1771+
"resources": {
1772+
"limits": {
1773+
"limitsKey": "0"
1774+
},
1775+
"requests": {
1776+
"requestsKey": "0"
1777+
},
1778+
"claims": [
1779+
{
1780+
"name": "nameValue",
1781+
"request": "requestValue"
1782+
}
1783+
]
1784+
}
17711785
}
17721786
},
17731787
"strategy": {

Diff for: ‎testdata/HEAD/apps.v1.Deployment.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1.Deployment.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,14 @@ spec:
872872
- name: nameValue
873873
resourceClaimName: resourceClaimNameValue
874874
resourceClaimTemplateName: resourceClaimTemplateNameValue
875+
resources:
876+
claims:
877+
- name: nameValue
878+
request: requestValue
879+
limits:
880+
limitsKey: "0"
881+
requests:
882+
requestsKey: "0"
875883
restartPolicy: restartPolicyValue
876884
runtimeClassName: runtimeClassNameValue
877885
schedulerName: schedulerNameValue

Diff for: ‎testdata/HEAD/apps.v1.ReplicaSet.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1768,7 +1768,21 @@
17681768
"resourceClaimName": "resourceClaimNameValue",
17691769
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17701770
}
1771-
]
1771+
],
1772+
"resources": {
1773+
"limits": {
1774+
"limitsKey": "0"
1775+
},
1776+
"requests": {
1777+
"requestsKey": "0"
1778+
},
1779+
"claims": [
1780+
{
1781+
"name": "nameValue",
1782+
"request": "requestValue"
1783+
}
1784+
]
1785+
}
17721786
}
17731787
}
17741788
},

Diff for: ‎testdata/HEAD/apps.v1.ReplicaSet.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1.ReplicaSet.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,14 @@ spec:
864864
- name: nameValue
865865
resourceClaimName: resourceClaimNameValue
866866
resourceClaimTemplateName: resourceClaimTemplateNameValue
867+
resources:
868+
claims:
869+
- name: nameValue
870+
request: requestValue
871+
limits:
872+
limitsKey: "0"
873+
requests:
874+
requestsKey: "0"
867875
restartPolicy: restartPolicyValue
868876
runtimeClassName: runtimeClassNameValue
869877
schedulerName: schedulerNameValue

Diff for: ‎testdata/HEAD/apps.v1.StatefulSet.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,21 @@
17671767
"resourceClaimName": "resourceClaimNameValue",
17681768
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17691769
}
1770-
]
1770+
],
1771+
"resources": {
1772+
"limits": {
1773+
"limitsKey": "0"
1774+
},
1775+
"requests": {
1776+
"requestsKey": "0"
1777+
},
1778+
"claims": [
1779+
{
1780+
"name": "nameValue",
1781+
"request": "requestValue"
1782+
}
1783+
]
1784+
}
17711785
}
17721786
},
17731787
"volumeClaimTemplates": [

Diff for: ‎testdata/HEAD/apps.v1.StatefulSet.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1.StatefulSet.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,14 @@ spec:
872872
- name: nameValue
873873
resourceClaimName: resourceClaimNameValue
874874
resourceClaimTemplateName: resourceClaimTemplateNameValue
875+
resources:
876+
claims:
877+
- name: nameValue
878+
request: requestValue
879+
limits:
880+
limitsKey: "0"
881+
requests:
882+
requestsKey: "0"
875883
restartPolicy: restartPolicyValue
876884
runtimeClassName: runtimeClassNameValue
877885
schedulerName: schedulerNameValue

Diff for: ‎testdata/HEAD/apps.v1beta1.Deployment.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,21 @@
17671767
"resourceClaimName": "resourceClaimNameValue",
17681768
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17691769
}
1770-
]
1770+
],
1771+
"resources": {
1772+
"limits": {
1773+
"limitsKey": "0"
1774+
},
1775+
"requests": {
1776+
"requestsKey": "0"
1777+
},
1778+
"claims": [
1779+
{
1780+
"name": "nameValue",
1781+
"request": "requestValue"
1782+
}
1783+
]
1784+
}
17711785
}
17721786
},
17731787
"strategy": {

Diff for: ‎testdata/HEAD/apps.v1beta1.Deployment.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1beta1.Deployment.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -874,6 +874,14 @@ spec:
874874
- name: nameValue
875875
resourceClaimName: resourceClaimNameValue
876876
resourceClaimTemplateName: resourceClaimTemplateNameValue
877+
resources:
878+
claims:
879+
- name: nameValue
880+
request: requestValue
881+
limits:
882+
limitsKey: "0"
883+
requests:
884+
requestsKey: "0"
877885
restartPolicy: restartPolicyValue
878886
runtimeClassName: runtimeClassNameValue
879887
schedulerName: schedulerNameValue

Diff for: ‎testdata/HEAD/apps.v1beta1.StatefulSet.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,21 @@
17671767
"resourceClaimName": "resourceClaimNameValue",
17681768
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17691769
}
1770-
]
1770+
],
1771+
"resources": {
1772+
"limits": {
1773+
"limitsKey": "0"
1774+
},
1775+
"requests": {
1776+
"requestsKey": "0"
1777+
},
1778+
"claims": [
1779+
{
1780+
"name": "nameValue",
1781+
"request": "requestValue"
1782+
}
1783+
]
1784+
}
17711785
}
17721786
},
17731787
"volumeClaimTemplates": [

Diff for: ‎testdata/HEAD/apps.v1beta1.StatefulSet.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1beta1.StatefulSet.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,14 @@ spec:
872872
- name: nameValue
873873
resourceClaimName: resourceClaimNameValue
874874
resourceClaimTemplateName: resourceClaimTemplateNameValue
875+
resources:
876+
claims:
877+
- name: nameValue
878+
request: requestValue
879+
limits:
880+
limitsKey: "0"
881+
requests:
882+
requestsKey: "0"
875883
restartPolicy: restartPolicyValue
876884
runtimeClassName: runtimeClassNameValue
877885
schedulerName: schedulerNameValue

Diff for: ‎testdata/HEAD/apps.v1beta2.DaemonSet.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,21 @@
17661766
"resourceClaimName": "resourceClaimNameValue",
17671767
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17681768
}
1769-
]
1769+
],
1770+
"resources": {
1771+
"limits": {
1772+
"limitsKey": "0"
1773+
},
1774+
"requests": {
1775+
"requestsKey": "0"
1776+
},
1777+
"claims": [
1778+
{
1779+
"name": "nameValue",
1780+
"request": "requestValue"
1781+
}
1782+
]
1783+
}
17701784
}
17711785
},
17721786
"updateStrategy": {

Diff for: ‎testdata/HEAD/apps.v1beta2.DaemonSet.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1beta2.DaemonSet.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,14 @@ spec:
864864
- name: nameValue
865865
resourceClaimName: resourceClaimNameValue
866866
resourceClaimTemplateName: resourceClaimTemplateNameValue
867+
resources:
868+
claims:
869+
- name: nameValue
870+
request: requestValue
871+
limits:
872+
limitsKey: "0"
873+
requests:
874+
requestsKey: "0"
867875
restartPolicy: restartPolicyValue
868876
runtimeClassName: runtimeClassNameValue
869877
schedulerName: schedulerNameValue

Diff for: ‎testdata/HEAD/apps.v1beta2.Deployment.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,21 @@
17671767
"resourceClaimName": "resourceClaimNameValue",
17681768
"resourceClaimTemplateName": "resourceClaimTemplateNameValue"
17691769
}
1770-
]
1770+
],
1771+
"resources": {
1772+
"limits": {
1773+
"limitsKey": "0"
1774+
},
1775+
"requests": {
1776+
"requestsKey": "0"
1777+
},
1778+
"claims": [
1779+
{
1780+
"name": "nameValue",
1781+
"request": "requestValue"
1782+
}
1783+
]
1784+
}
17711785
}
17721786
},
17731787
"strategy": {

Diff for: ‎testdata/HEAD/apps.v1beta2.Deployment.pb

68 Bytes
Binary file not shown.

Diff for: ‎testdata/HEAD/apps.v1beta2.Deployment.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,14 @@ spec:
872872
- name: nameValue
873873
resourceClaimName: resourceClaimNameValue
874874
resourceClaimTemplateName: resourceClaimTemplateNameValue
875+
resources:
876+
claims:
877+
- name: nameValue
878+
request: requestValue
879+
limits:
880+
limitsKey: "0"
881+
requests:
882+
requestsKey: "0"
875883
restartPolicy: restartPolicyValue
876884
runtimeClassName: runtimeClassNameValue
877885
schedulerName: schedulerNameValue

0 commit comments

Comments
 (0)