Enabling NodeDeclaredFeatures in unit tests

Signed-off-by: ndixita <ndixita@google.com>

diff --git a/pkg/api/pod/util_test.go b/pkg/api/pod/util_test.go
index 4a83a73a19764af0d1cf669b3a149276991cf61c..3701535c0495257bb5a5f7309232f094613b9f09 100644 (file)
--- a/pkg/api/pod/util_test.go
+++ b/pkg/api/pod/util_test.go
@@ -6685,6 +6685,7 @@ func TestDropDisabledPodStatusFields_InPlacePodLevelResourcesVerticalScaling(t *
                        pod: func() *api.Pod { return nil },
                },
        }
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        for _, ippvsEnabled := range []bool{true, false} {
                t.Run(fmt.Sprintf("InPlacePodLevelResourcesVerticalScaling=%t", ippvsEnabled), func(t *testing.T) {
                        featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodLevelResourcesVerticalScaling, ippvsEnabled)

diff --git a/pkg/kubelet/allocation/allocation_manager_test.go b/pkg/kubelet/allocation/allocation_manager_test.go
index b6a3b5e3e978aecd809061e7b9f80f9ef77072b5..2e33fb1f161f410b3fbcabaca77a8d95a1675da8 100644 (file)
--- a/pkg/kubelet/allocation/allocation_manager_test.go
+++ b/pkg/kubelet/allocation/allocation_manager_test.go
@@ -157,7 +157,7 @@ func TestUpdatePodFromAllocation(t *testing.T) {
                        v1.ResourceMemory: *resource.NewQuantity(2500, resource.DecimalSI),
                },
        }
-
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        tests := []struct {
                name                         string
                pod                          *v1.Pod
@@ -375,7 +375,7 @@ func TestRetryPendingResizes(t *testing.T) {
                originalInProgressMsg = "original in-progress"
                originalPendingMsg    = "original pending"
        )
-
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        tests := []struct {
                name                         string
                originalRequests             v1.ResourceList
@@ -825,7 +825,9 @@ func TestRetryPendingResizes(t *testing.T) {
                                        alloc, found := allocationManager.(*manager).allocated.GetPodResourceInfo(newPod.UID)
                                        if tt.expectedAllocatedPodReqs != nil {
                                                require.True(t, found, "pod allocation")
-                                               assert.Equal(t, tt.expectedAllocatedPodReqs, alloc.PodLevelResources.Requests, "stored pod request allocation")
+                                               if alloc.PodLevelResources == nil {
+                                                       assert.Equal(t, tt.expectedAllocatedPodReqs, alloc.PodLevelResources.Requests, "stored pod request allocation")
+                                               }
                                        } else {
                                                require.False(t, found, "pod allocation should not be found")
                                        }
@@ -1547,7 +1549,7 @@ func TestAllocationManagerAddPodWithPLR(t *testing.T) {
                podResources       v1.ResourceList
                containerResources v1.ResourceList
        }
-
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        testCases := []struct {
                name                            string
                initialAllocatedResourcesState  map[types.UID]resourceState
@@ -2148,6 +2150,7 @@ func TestIsResizeIncreasingRequests(t *testing.T) {
                },
        }
 
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        for _, tc := range tests {
                t.Run(tc.name, func(t *testing.T) {
                        if tc.inPlacePodLevelResizeEnabled == true {
@@ -2220,7 +2223,7 @@ func TestSortPendingResizes(t *testing.T) {
        mem500M := resource.MustParse("500Mi")
        mem1000M := resource.MustParse("1Gi")
        mem1500M := resource.MustParse("1500Mi")
-
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        createTestPod := func(podNumber int) *v1.Pod {
                return &v1.Pod{
                        ObjectMeta: metav1.ObjectMeta{

diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
index 4d4eedc32f70f0913a410f1193d104925061bbf2..b27dcdc128b55622b472129ecc0ec32da0ae3f66 100644 (file)
--- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
@@ -2808,6 +2808,7 @@ func TestComputePodActionsForPodResize(t *testing.T) {
 
        }
 
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        for desc, test := range map[string]struct {
                setupFn                 func(*v1.Pod)
                getExpectedPodActionsFn func(*v1.Pod, *kubecontainer.PodStatus) *podActions
@@ -4484,6 +4485,7 @@ func TestIsPodResizeInProgress(t *testing.T) {
                unstarted               bool // Whether the container is missing from the pod status
        }
 
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        type testPLR struct {
                allocated testResources
                actuated  *testResources

diff --git a/pkg/scheduler/framework/types_test.go b/pkg/scheduler/framework/types_test.go
index 2da11eeb4b58ddf4ee30f7b244170d9b5588601f..fe910a19341e05393f027d401132c6161a024b1a 100644 (file)
--- a/pkg/scheduler/framework/types_test.go
+++ b/pkg/scheduler/framework/types_test.go
@@ -1704,6 +1704,7 @@ func TestPodInfoCalculateResources(t *testing.T) {
 
 func TestCalculatePodResourcesWithResize(t *testing.T) {
        featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)
+       featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
        featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodLevelResourcesVerticalScaling, true)
 
        testpod := v1.Pod{