VPA: (squash) Fix updater test for in-place

So in-place VPA checks happen before eviction checks do, and we fall
back to eviction if in-place VPA isn't possible.

In-place VPA happens immediatly (rather than the delay with eviction) so
we seem to be able to catch early "0" recommendations from the VPA when
it hasn't recommended anything yet unless we wait for the VPA's
recommendation to be provided.

The problem is, the updater test was not set up to accommidate that, it
expects eviction immediately which would seem to be wrong and probably
not what we want (it's possible something else before in-place made
that "not wrong" but for now I'm operating under the assumption that the
"eviction delay" was saving us from having any trouble with this in the
real world).

So until I get to the bottom of how we should be behaving when the VPA
hasn't made a recommendation yet, I'm going to adjust the test suite so
it allows for in-place's "wait until we have a recommendation" logic.

And I need to come back here and have proper tests for in-place with
simulating the InPlacePodVerticalScaling behavior being enabled.

Author: jkyros

vertical-pod-autoscaler/pkg/updater/logic/updater_test.go

@@ -22,12 +22,12 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/time/rate"
-	v1 "k8s.io/api/autoscaling/v1"
-
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
+	"golang.org/x/time/rate"
+	v1 "k8s.io/api/autoscaling/v1"
 	apiv1 "k8s.io/api/core/v1"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -160,7 +160,6 @@ func testRunOnceBase(
 		// We will test in-place separately, but we do need to account for these calls
 		eviction.On("CanInPlaceUpdate", pods[i]).Return(false)
 		eviction.On("IsInPlaceUpdating", pods[i]).Return(false)
-
 		eviction.On("CanEvict", pods[i]).Return(true)
 		eviction.On("Evict", pods[i], nil).Return(nil)
 	}
@@ -175,12 +174,17 @@ func testRunOnceBase(
 		Name:       rc.Name,
 		APIVersion: rc.APIVersion,
 	}
+	// TOD0(jkyros): I added the recommendationProvided condition here because in-place needs to wait for a
+	// recommendation to scale, causing this test to fail (because in-place checks before eviction, and in-place will
+	// wait to scale -- and not fall back to eviction -- until the VPA has made a recommendation)
+
 	vpaObj := test.VerticalPodAutoscaler().
 		WithContainer(containerName).
 		WithTarget("2", "200M").
 		WithMinAllowed(containerName, "1", "100M").
 		WithMaxAllowed(containerName, "3", "1G").
-		WithTargetRef(targetRef).Get()
+		WithTargetRef(targetRef).
+		AppendCondition(vpa_types.RecommendationProvided, corev1.ConditionTrue, "reason", "msg", time.Unix(0, 0)).Get()
 
 	vpaObj.Spec.UpdatePolicy = &vpa_types.PodUpdatePolicy{UpdateMode: &updateMode}
 	vpaLister.On("List").Return([]*vpa_types.VerticalPodAutoscaler{vpaObj}, nil).Once()
@@ -312,14 +316,19 @@ func TestRunOnceIgnoreNamespaceMatchingPods(t *testing.T) {
 		Name:       rc.Name,
 		APIVersion: rc.APIVersion,
 	}
+
+	// TOD0(jkyros): I added the recommendationProvided condition here because in-place needs to wait for a
+	// recommendation to scale, causing this test to fail (because in-place checks before eviction, and in-place will
+	// wait to scale -- and not fall back to eviction -- until the VPA has made a recommendation)
 	vpaObj := test.VerticalPodAutoscaler().
 		WithNamespace("default").
 		WithContainer(containerName).
 		WithTarget("2", "200M").
 		WithMinAllowed(containerName, "1", "100M").
 		WithMaxAllowed(containerName, "3", "1G").
-		WithTargetRef(targetRef).Get()
-
+		WithTargetRef(targetRef).
+		AppendCondition(vpa_types.RecommendationProvided, corev1.ConditionTrue, "reason", "msg", time.Unix(0, 0)).
+		Get()
 	vpaLister.On("List").Return([]*vpa_types.VerticalPodAutoscaler{vpaObj}, nil).Once()
 
 	mockSelectorFetcher := target_mock.NewMockVpaTargetSelectorFetcher(ctrl)