From 38753efcc758e16cb501906b9a1aabb7308a0246 Mon Sep 17 00:00:00 2001
From: Robert Krawitz <rkrawitz@redhat.com>
Date: Tue, 21 May 2019 18:30:37 -0400
Subject: [PATCH] Set sizeLimit to the smaller of the ephemeral storage limit
 and the emptydir limit (if set)

---
 pkg/kubelet/volumemanager/cache/desired_state_of_world.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/kubelet/volumemanager/cache/desired_state_of_world.go b/pkg/kubelet/volumemanager/cache/desired_state_of_world.go
index c80b03e7062..28b15b5f161 100644
--- a/pkg/kubelet/volumemanager/cache/desired_state_of_world.go
+++ b/pkg/kubelet/volumemanager/cache/desired_state_of_world.go
@@ -238,6 +238,12 @@ func (dsw *desiredStateOfWorld) AddPodToVolume(
 				_, podLimits := apiv1resource.PodRequestsAndLimits(pod)
 				ephemeralStorageLimit := podLimits[v1.ResourceEphemeralStorage]
 				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{