Skip to content

Commit 5ac2ffc

Browse files
committed
Enabling NodeDeclaredFeatures in unit tests
Signed-off-by: ndixita <[email protected]>
1 parent 0e88308 commit 5ac2ffc

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

pkg/api/pod/util_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6685,6 +6685,7 @@ func TestDropDisabledPodStatusFields_InPlacePodLevelResourcesVerticalScaling(t *
66856685
pod: func() *api.Pod { return nil },
66866686
},
66876687
}
6688+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
66886689
for _, ippvsEnabled := range []bool{true, false} {
66896690
t.Run(fmt.Sprintf("InPlacePodLevelResourcesVerticalScaling=%t", ippvsEnabled), func(t *testing.T) {
66906691
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodLevelResourcesVerticalScaling, ippvsEnabled)

pkg/kubelet/allocation/allocation_manager_test.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func TestUpdatePodFromAllocation(t *testing.T) {
157157
v1.ResourceMemory: *resource.NewQuantity(2500, resource.DecimalSI),
158158
},
159159
}
160-
160+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
161161
tests := []struct {
162162
name string
163163
pod *v1.Pod
@@ -375,7 +375,7 @@ func TestRetryPendingResizes(t *testing.T) {
375375
originalInProgressMsg = "original in-progress"
376376
originalPendingMsg = "original pending"
377377
)
378-
378+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
379379
tests := []struct {
380380
name string
381381
originalRequests v1.ResourceList
@@ -825,7 +825,9 @@ func TestRetryPendingResizes(t *testing.T) {
825825
alloc, found := allocationManager.(*manager).allocated.GetPodResourceInfo(newPod.UID)
826826
if tt.expectedAllocatedPodReqs != nil {
827827
require.True(t, found, "pod allocation")
828-
assert.Equal(t, tt.expectedAllocatedPodReqs, alloc.PodLevelResources.Requests, "stored pod request allocation")
828+
if alloc.PodLevelResources == nil {
829+
assert.Equal(t, tt.expectedAllocatedPodReqs, alloc.PodLevelResources.Requests, "stored pod request allocation")
830+
}
829831
} else {
830832
require.False(t, found, "pod allocation should not be found")
831833
}
@@ -1547,7 +1549,7 @@ func TestAllocationManagerAddPodWithPLR(t *testing.T) {
15471549
podResources v1.ResourceList
15481550
containerResources v1.ResourceList
15491551
}
1550-
1552+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
15511553
testCases := []struct {
15521554
name string
15531555
initialAllocatedResourcesState map[types.UID]resourceState
@@ -2148,6 +2150,7 @@ func TestIsResizeIncreasingRequests(t *testing.T) {
21482150
},
21492151
}
21502152

2153+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
21512154
for _, tc := range tests {
21522155
t.Run(tc.name, func(t *testing.T) {
21532156
if tc.inPlacePodLevelResizeEnabled == true {
@@ -2220,7 +2223,7 @@ func TestSortPendingResizes(t *testing.T) {
22202223
mem500M := resource.MustParse("500Mi")
22212224
mem1000M := resource.MustParse("1Gi")
22222225
mem1500M := resource.MustParse("1500Mi")
2223-
2226+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
22242227
createTestPod := func(podNumber int) *v1.Pod {
22252228
return &v1.Pod{
22262229
ObjectMeta: metav1.ObjectMeta{

pkg/kubelet/kuberuntime/kuberuntime_manager_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2808,6 +2808,7 @@ func TestComputePodActionsForPodResize(t *testing.T) {
28082808

28092809
}
28102810

2811+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
28112812
for desc, test := range map[string]struct {
28122813
setupFn func(*v1.Pod)
28132814
getExpectedPodActionsFn func(*v1.Pod, *kubecontainer.PodStatus) *podActions
@@ -4484,6 +4485,7 @@ func TestIsPodResizeInProgress(t *testing.T) {
44844485
unstarted bool // Whether the container is missing from the pod status
44854486
}
44864487

4488+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
44874489
type testPLR struct {
44884490
allocated testResources
44894491
actuated *testResources

pkg/scheduler/framework/types_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,6 +1704,7 @@ func TestPodInfoCalculateResources(t *testing.T) {
17041704

17051705
func TestCalculatePodResourcesWithResize(t *testing.T) {
17061706
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)
1707+
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.NodeDeclaredFeatures, true)
17071708
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodLevelResourcesVerticalScaling, true)
17081709

17091710
testpod := v1.Pod{

0 commit comments

Comments
 (0)