Merge pull request #47179 from ddysher/local-isolation-fix
Automatic merge from submit-queue (batch tested with PRs 47883, 47179, 46966, 47982, 47945) Fix local isolation for pod requesting only overlay or scratch **What this PR does / why we need it**: Fix overlay resource predicates for pod with only overlay or scratch storage request. E.g. the following pod can pass predicate even if overlay is only 512Gi. ```yaml apiVersion: v1 kind: Pod metadata: name: pod spec: containers: - name: nginx image: nginx resources: requests: storage.kubernetes.io/overlay: 1024Gi ``` similarly, following pod will also pass predicate ```yaml apiVersion: v1 kind: Pod metadata: name: pod spec: containers: - name: nginx image: nginx volumeMounts: - name: data mountPath: /data volumes: - name: data emptyDir: sizeLimit: 1024Gi ``` **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes https://github.com/kubernetes/kubernetes/issues/47798 **Special notes for your reviewer**: **Release note**: ```release-note ``` @jingxu97 @vishh @dashpole
This commit is contained in:
@@ -584,7 +584,7 @@ func PodFitsResources(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.No
|
||||
// We couldn't parse metadata - fallback to computing it.
|
||||
podRequest = GetResourceRequest(pod)
|
||||
}
|
||||
if podRequest.MilliCPU == 0 && podRequest.Memory == 0 && podRequest.NvidiaGPU == 0 && len(podRequest.OpaqueIntResources) == 0 {
|
||||
if podRequest.MilliCPU == 0 && podRequest.Memory == 0 && podRequest.NvidiaGPU == 0 && podRequest.StorageOverlay == 0 && podRequest.StorageScratch == 0 && len(podRequest.OpaqueIntResources) == 0 {
|
||||
return len(predicateFails) == 0, predicateFails, nil
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user