Merge pull request #123904 from kannon92/innocent-eviction-potential-fix
innocent-pod should not be evicted due to exceeding requests/limits
This commit is contained in:
		@@ -970,6 +970,19 @@ func innocentPod() *v1.Pod {
 | 
			
		||||
						"-c",
 | 
			
		||||
						"while true; do sleep 5; done",
 | 
			
		||||
					},
 | 
			
		||||
					Resources: v1.ResourceRequirements{
 | 
			
		||||
						// These values are set so that we don't consider this pod to be over the limits
 | 
			
		||||
						// If the requests are not set, then we assume a request limit of 0 so it is always over.
 | 
			
		||||
						// This fixes this for the innocent pod.
 | 
			
		||||
						Requests: v1.ResourceList{
 | 
			
		||||
							v1.ResourceEphemeralStorage: resource.MustParse("50Mi"),
 | 
			
		||||
							v1.ResourceMemory:           resource.MustParse("50Mi"),
 | 
			
		||||
						},
 | 
			
		||||
						Limits: v1.ResourceList{
 | 
			
		||||
							v1.ResourceEphemeralStorage: resource.MustParse("50Mi"),
 | 
			
		||||
							v1.ResourceMemory:           resource.MustParse("50Mi"),
 | 
			
		||||
						},
 | 
			
		||||
					},
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user