Skip to content

K
k3s
Commit 38753efc authored by Robert Krawitz's avatar Robert Krawitz
Browse files
Options

Set sizeLimit to the smaller of the ephemeral storage limit and the emptydir limit (if set)

parent 9f4a4d1f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
pkg/kubelet/volumemanager/cache/desired_state_of_world.go
View file @ 38753efc
...@@ -238,6 +238,12 @@ func (dsw *desiredStateOfWorld) AddPodToVolume( ...@@ -238,6 +238,12 @@ func (dsw *desiredStateOfWorld) AddPodToVolume(
_, podLimits := apiv1resource.PodRequestsAndLimits(pod) _, podLimits := apiv1resource.PodRequestsAndLimits(pod)
ephemeralStorageLimit := podLimits[v1.ResourceEphemeralStorage] ephemeralStorageLimit := podLimits[v1.ResourceEphemeralStorage]
sizeLimit = resource.NewQuantity(ephemeralStorageLimit.Value(), resource.BinarySI) sizeLimit = resource.NewQuantity(ephemeralStorageLimit.Value(), resource.BinarySI)
if volumeSpec.Volume.EmptyDir != nil &&
volumeSpec.Volume.EmptyDir.SizeLimit != nil &&
volumeSpec.Volume.EmptyDir.SizeLimit.Value() > 0 &&
volumeSpec.Volume.EmptyDir.SizeLimit.Value() < sizeLimit.Value() {
sizeLimit = resource.NewQuantity(volumeSpec.Volume.EmptyDir.SizeLimit.Value(), resource.BinarySI)
}
} }
} }
dsw.volumesToMount[volumeName] = volumeToMount{ dsw.volumesToMount[volumeName] = volumeToMount{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment