fixup! VPA: Allow updater to actuate InPlaceOrRecreate updates

Signed-off-by: Max Cao <[email protected]>

Author: maxcao13

vertical-pod-autoscaler/pkg/updater/eviction/pods_eviction_restriction.go

@@ -120,6 +120,8 @@ func (e *podsEvictionRestrictionImpl) CanEvict(pod *apiv1.Pod) bool {
 		}
 		if present {
 			shouldBeAlive := singleGroupStats.configured - singleGroupStats.evictionTolerance
+			actuallyAlive := singleGroupStats.running - (singleGroupStats.evicted + singleGroupStats.inPlaceUpdating)
+
 			klog.V(4).InfoS("Pod disruption tolerance",
 				"pod", klog.KObj(pod),
 				"running", singleGroupStats.running,
@@ -128,17 +130,17 @@ func (e *podsEvictionRestrictionImpl) CanEvict(pod *apiv1.Pod) bool {
 				"evicted", singleGroupStats.evicted,
 				"updating", singleGroupStats.inPlaceUpdating)
 			if IsInPlaceUpdating(pod) {
-				if singleGroupStats.running-(singleGroupStats.evicted+(singleGroupStats.inPlaceUpdating-1)) > shouldBeAlive {
-					klog.V(4).InfoS("Would be able to evict, but already resizing", "pod", klog.KObj(pod))
+				if (actuallyAlive - 1) > shouldBeAlive { // -1 because this pod is the one being in-place updated
 					if pod.Status.Resize == apiv1.PodResizeStatusInfeasible || pod.Status.Resize == apiv1.PodResizeStatusDeferred {
 						klog.InfoS("Attempted in-place resize was impossible, should now evict", "pod", klog.KObj(pod), "resizePolicy", pod.Status.Resize)
 						return true
 					}
 				}
+				klog.V(4).InfoS("Would be able to evict, but already resizing", "pod", klog.KObj(pod))
 				return false
 			}
 
-			if singleGroupStats.running-(singleGroupStats.evicted+singleGroupStats.inPlaceUpdating) > shouldBeAlive {
+			if actuallyAlive > shouldBeAlive {
 				return true
 			}
 			// If all pods are running and eviction tolerance is small evict 1 pod.
@@ -463,34 +465,33 @@ func (e *podsEvictionRestrictionImpl) CanInPlaceUpdate(pod *apiv1.Pod) bool {
 			klog.V(4).InfoS("Can't resize pending pod", "pod", klog.KObj(pod))
 			return false
 		}
-		// TODO(maxcao13): May need to rename evictionTolerance to disruptionTolerance
+		// TODO: Rename evictionTolerance to disruptionTolerance?
 		if present {
-			// minimum number of pods that should be running to tolerate disruptions
 			shouldBeAlive := singleGroupStats.configured - singleGroupStats.evictionTolerance
-			// number of pods that are actually running
 			actuallyAlive := singleGroupStats.running - (singleGroupStats.evicted + singleGroupStats.inPlaceUpdating)
-			klog.V(4).InfoS("Checking pod disruption tolerance",
-				"pod", klog.KObj(pod),
-				"configuredPods", singleGroupStats.configured,
-				"runningPods", singleGroupStats.running,
-				"evictedPods", singleGroupStats.evicted,
-				"inPlaceUpdatingPods", singleGroupStats.inPlaceUpdating,
-				"evictionTolerance", singleGroupStats.evictionTolerance,
-				"shouldBeAlive", shouldBeAlive,
-				"actuallyAlive", actuallyAlive,
-			)
+			eligibleForInPlaceUpdate := false
+
 			if actuallyAlive > shouldBeAlive {
-				klog.V(4).InfoS("Pod can be resized in-place; more pods are running than required", "pod", klog.KObj(pod), "shouldBeAlive", shouldBeAlive, "actuallyAlive", actuallyAlive)
-				return true
+				eligibleForInPlaceUpdate = true
 			}
 
 			// If all pods are running, no pods are being evicted or updated, and eviction tolerance is small, we can resize in-place
 			if singleGroupStats.running == singleGroupStats.configured &&
 				singleGroupStats.evictionTolerance == 0 &&
 				singleGroupStats.evicted == 0 && singleGroupStats.inPlaceUpdating == 0 {
-				klog.V(4).InfoS("Pod can be resized in-place; all pods are running and eviction tolerance is 0", "pod", klog.KObj(pod))
-				return true
+				eligibleForInPlaceUpdate = true
 			}
+
+			klog.V(4).InfoS("Pod disruption tolerance",
+				"pod", klog.KObj(pod),
+				"configuredPods", singleGroupStats.configured,
+				"runningPods", singleGroupStats.running,
+				"evictedPods", singleGroupStats.evicted,
+				"inPlaceUpdatingPods", singleGroupStats.inPlaceUpdating,
+				"evictionTolerance", singleGroupStats.evictionTolerance,
+				"eligibleForInPlaceUpdate", eligibleForInPlaceUpdate,
+			)
+			return eligibleForInPlaceUpdate
 		}
 	}
 	return false