github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Add downward_api e2e test for LocalStorageCapacityIsolation feature

Browse Source
This commit is contained in:
NickrenREN
2017-09-15 13:38:29 +08:00
parent 6a8d1545e6
commit d379a9a3ff
2 changed files with 106 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/v1/resource/helpers.go
View File

@@ -192,7 +192,7 @@ func MergeContainerResourceLimits(container *v1.Container,
if container.Resources.Limits == nil {
container.Resources.Limits = make(v1.ResourceList)
}
for _, resource := range []v1.ResourceName{v1.ResourceCPU, v1.ResourceMemory} {
for _, resource := range []v1.ResourceName{v1.ResourceCPU, v1.ResourceMemory, v1.ResourceEphemeralStorage} {
if quantity, exists := container.Resources.Limits[resource]; !exists || quantity.IsZero() {
if cap, exists := allocatable[resource]; exists {
container.Resources.Limits[resource] = *cap.Copy()