Skip to content

Commit 9bbf768

Browse files
wongma7wongma7
committed
Fix BlockVolume feature gate toggling in validation & defaults unit tests
1 parent bee759b commit 9bbf768

File tree

2 files changed

+54
-100
lines changed

2 files changed

+54
-100
lines changed

‎pkg/apis/core/v1/defaults_test.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -825,10 +825,7 @@ func TestSetDefaultPersistentVolume(t *testing.T) {
825825
}
826826

827827
// When feature gate is enabled, field should be defaulted
828-
err := utilfeature.DefaultFeatureGate.Set("BlockVolume=true")
829-
if err != nil {
830-
t.Fatalf("Failed to enable feature gate for BlockVolume: %v", err)
831-
}
828+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, true)()
832829
obj3 := roundTrip(t, runtime.Object(pv)).(*v1.PersistentVolume)
833830
outputMode3 := obj3.Spec.VolumeMode
834831

@@ -857,10 +854,7 @@ func TestSetDefaultPersistentVolumeClaim(t *testing.T) {
857854
}
858855

859856
// When feature gate is enabled, field should be defaulted
860-
err := utilfeature.DefaultFeatureGate.Set("BlockVolume=true")
861-
if err != nil {
862-
t.Fatalf("Failed to enable feature gate for BlockVolume: %v", err)
863-
}
857+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, true)()
864858
obj3 := roundTrip(t, runtime.Object(pvc)).(*v1.PersistentVolumeClaim)
865859
outputMode3 := obj3.Spec.VolumeMode
866860

‎pkg/apis/core/validation/validation_test.go

+52-92
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ func TestValidatePersistentVolumes(t *testing.T) {
6868
validMode := core.PersistentVolumeFilesystem
6969
invalidMode := core.PersistentVolumeMode("fakeVolumeMode")
7070
scenarios := map[string]struct {
71-
isExpectedFailure bool
72-
volume *core.PersistentVolume
73-
disableBlockVolume bool
71+
isExpectedFailure bool
72+
volume *core.PersistentVolume
73+
disableBlock bool
7474
}{
7575
"good-volume": {
7676
isExpectedFailure: false,
@@ -371,8 +371,8 @@ func TestValidatePersistentVolumes(t *testing.T) {
371371
}),
372372
},
373373
"feature disabled valid volume mode": {
374-
disableBlockVolume: true,
375-
isExpectedFailure: true,
374+
disableBlock: true,
375+
isExpectedFailure: true,
376376
volume: testVolume("foo", "", core.PersistentVolumeSpec{
377377
Capacity: core.ResourceList{
378378
core.ResourceName(core.ResourceStorage): resource.MustParse("10G"),
@@ -433,20 +433,16 @@ func TestValidatePersistentVolumes(t *testing.T) {
433433
}
434434

435435
for name, scenario := range scenarios {
436-
var restore func()
437-
if scenario.disableBlockVolume {
438-
restore = utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, false)
439-
}
440-
errs := ValidatePersistentVolume(scenario.volume)
441-
if len(errs) == 0 && scenario.isExpectedFailure {
442-
t.Errorf("Unexpected success for scenario: %s", name)
443-
}
444-
if len(errs) > 0 && !scenario.isExpectedFailure {
445-
t.Errorf("Unexpected failure for scenario: %s - %+v", name, errs)
446-
}
447-
if scenario.disableBlockVolume {
448-
restore()
449-
}
436+
t.Run(name, func(t *testing.T) {
437+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, !scenario.disableBlock)()
438+
errs := ValidatePersistentVolume(scenario.volume)
439+
if len(errs) == 0 && scenario.isExpectedFailure {
440+
t.Errorf("Unexpected success for scenario: %s", name)
441+
}
442+
if len(errs) > 0 && !scenario.isExpectedFailure {
443+
t.Errorf("Unexpected failure for scenario: %s - %+v", name, errs)
444+
}
445+
})
450446
}
451447

452448
}
@@ -834,9 +830,9 @@ func TestValidatePersistentVolumeClaim(t *testing.T) {
834830
invalidMode := core.PersistentVolumeMode("fakeVolumeMode")
835831
validMode := core.PersistentVolumeFilesystem
836832
scenarios := map[string]struct {
837-
isExpectedFailure bool
838-
claim *core.PersistentVolumeClaim
839-
disableBlockVolume bool
833+
isExpectedFailure bool
834+
claim *core.PersistentVolumeClaim
835+
disableBlock bool
840836
}{
841837
"good-claim": {
842838
isExpectedFailure: false,
@@ -1032,8 +1028,8 @@ func TestValidatePersistentVolumeClaim(t *testing.T) {
10321028
}),
10331029
},
10341030
"feature disabled valid volume mode": {
1035-
disableBlockVolume: true,
1036-
isExpectedFailure: true,
1031+
disableBlock: true,
1032+
isExpectedFailure: true,
10371033
claim: testVolumeClaim("foo", "ns", core.PersistentVolumeClaimSpec{
10381034
Selector: &metav1.LabelSelector{
10391035
MatchExpressions: []metav1.LabelSelectorRequirement{
@@ -1074,20 +1070,16 @@ func TestValidatePersistentVolumeClaim(t *testing.T) {
10741070
}
10751071

10761072
for name, scenario := range scenarios {
1077-
var restore func()
1078-
if scenario.disableBlockVolume {
1079-
restore = utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, false)
1080-
}
1081-
errs := ValidatePersistentVolumeClaim(scenario.claim)
1082-
if len(errs) == 0 && scenario.isExpectedFailure {
1083-
t.Errorf("Unexpected success for scenario: %s", name)
1084-
}
1085-
if len(errs) > 0 && !scenario.isExpectedFailure {
1086-
t.Errorf("Unexpected failure for scenario: %s - %+v", name, errs)
1087-
}
1088-
if scenario.disableBlockVolume {
1089-
restore()
1090-
}
1073+
t.Run(name, func(t *testing.T) {
1074+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, !scenario.disableBlock)()
1075+
errs := ValidatePersistentVolumeClaim(scenario.claim)
1076+
if len(errs) == 0 && scenario.isExpectedFailure {
1077+
t.Errorf("Unexpected success for scenario: %s", name)
1078+
}
1079+
if len(errs) > 0 && !scenario.isExpectedFailure {
1080+
t.Errorf("Unexpected failure for scenario: %s - %+v", name, errs)
1081+
}
1082+
})
10911083
}
10921084
}
10931085

@@ -1170,15 +1162,17 @@ func TestAlphaPVVolumeModeUpdate(t *testing.T) {
11701162
}
11711163

11721164
for name, scenario := range scenarios {
1173-
// ensure we have a resource version specified for updates
1174-
toggleBlockVolumeFeature(scenario.enableBlock, t)
1175-
errs := ValidatePersistentVolumeUpdate(scenario.newPV, scenario.oldPV)
1176-
if len(errs) == 0 && scenario.isExpectedFailure {
1177-
t.Errorf("Unexpected success for scenario: %s", name)
1178-
}
1179-
if len(errs) > 0 && !scenario.isExpectedFailure {
1180-
t.Errorf("Unexpected failure for scenario: %s - %+v", name, errs)
1181-
}
1165+
t.Run(name, func(t *testing.T) {
1166+
// ensure we have a resource version specified for updates
1167+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, scenario.enableBlock)()
1168+
errs := ValidatePersistentVolumeUpdate(scenario.newPV, scenario.oldPV)
1169+
if len(errs) == 0 && scenario.isExpectedFailure {
1170+
t.Errorf("Unexpected success for scenario: %s", name)
1171+
}
1172+
if len(errs) > 0 && !scenario.isExpectedFailure {
1173+
t.Errorf("Unexpected failure for scenario: %s - %+v", name, errs)
1174+
}
1175+
})
11821176
}
11831177
}
11841178

@@ -1622,8 +1616,7 @@ func TestValidatePersistentVolumeClaimUpdate(t *testing.T) {
16221616
t.Run(name, func(t *testing.T) {
16231617
// ensure we have a resource version specified for updates
16241618
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ExpandPersistentVolumes, scenario.enableResize)()
1625-
1626-
toggleBlockVolumeFeature(scenario.enableBlock, t)
1619+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, scenario.enableBlock)()
16271620
scenario.oldClaim.ResourceVersion = "1"
16281621
scenario.newClaim.ResourceVersion = "1"
16291622
errs := ValidatePersistentVolumeClaimUpdate(scenario.newClaim, scenario.oldClaim)
@@ -1637,23 +1630,6 @@ func TestValidatePersistentVolumeClaimUpdate(t *testing.T) {
16371630
}
16381631
}
16391632

1640-
func toggleBlockVolumeFeature(toggleFlag bool, t *testing.T) {
1641-
if toggleFlag {
1642-
// Enable alpha feature BlockVolume
1643-
err := utilfeature.DefaultFeatureGate.Set("BlockVolume=true")
1644-
if err != nil {
1645-
t.Errorf("Failed to enable feature gate for BlockVolume: %v", err)
1646-
return
1647-
}
1648-
} else {
1649-
err := utilfeature.DefaultFeatureGate.Set("BlockVolume=false")
1650-
if err != nil {
1651-
t.Errorf("Failed to disable feature gate for BlockVolume: %v", err)
1652-
return
1653-
}
1654-
}
1655-
}
1656-
16571633
func TestValidateKeyToPath(t *testing.T) {
16581634
testCases := []struct {
16591635
kp core.KeyToPath
@@ -3944,13 +3920,9 @@ func TestAlphaHugePagesIsolation(t *testing.T) {
39443920
}
39453921
}
39463922

3947-
func TestAlphaPVCVolumeMode(t *testing.T) {
3948-
// Enable alpha feature BlockVolume for PVC
3949-
err := utilfeature.DefaultFeatureGate.Set("BlockVolume=true")
3950-
if err != nil {
3951-
t.Errorf("Failed to enable feature gate for BlockVolume: %v", err)
3952-
return
3953-
}
3923+
func TestPVCVolumeMode(t *testing.T) {
3924+
// Enable feature BlockVolume for PVC
3925+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, true)()
39543926

39553927
block := core.PersistentVolumeBlock
39563928
file := core.PersistentVolumeFilesystem
@@ -3981,13 +3953,9 @@ func TestAlphaPVCVolumeMode(t *testing.T) {
39813953
}
39823954
}
39833955

3984-
func TestAlphaPVVolumeMode(t *testing.T) {
3985-
// Enable alpha feature BlockVolume for PV
3986-
err := utilfeature.DefaultFeatureGate.Set("BlockVolume=true")
3987-
if err != nil {
3988-
t.Errorf("Failed to enable feature gate for BlockVolume: %v", err)
3989-
return
3990-
}
3956+
func TestPVVolumeMode(t *testing.T) {
3957+
// Enable feature BlockVolume for PVC
3958+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, true)()
39913959

39923960
block := core.PersistentVolumeBlock
39933961
file := core.PersistentVolumeFilesystem
@@ -5152,12 +5120,8 @@ func TestAlphaValidateVolumeDevices(t *testing.T) {
51525120
{Name: "abc-123", MountPath: "/this/path/exists"},
51535121
}
51545122

5155-
// enable Alpha BlockVolume
5156-
err1 := utilfeature.DefaultFeatureGate.Set("BlockVolume=true")
5157-
if err1 != nil {
5158-
t.Errorf("Failed to enable feature gate for BlockVolume: %v", err1)
5159-
return
5160-
}
5123+
// enable BlockVolume
5124+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, true)()
51615125
// Success Cases:
51625126
// Validate normal success cases - only PVC volumeSource
51635127
if errs := ValidateVolumeDevices(successCase, GetVolumeMountMap(goodVolumeMounts), vols, field.NewPath("field")); len(errs) != 0 {
@@ -5172,12 +5136,8 @@ func TestAlphaValidateVolumeDevices(t *testing.T) {
51725136
}
51735137
}
51745138

5175-
// disable Alpha BlockVolume
5176-
err2 := utilfeature.DefaultFeatureGate.Set("BlockVolume=false")
5177-
if err2 != nil {
5178-
t.Errorf("Failed to disable feature gate for BlockVolume: %v", err2)
5179-
return
5180-
}
5139+
// disable BlockVolume
5140+
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.BlockVolume, false)()
51815141
if errs := ValidateVolumeDevices(disabledAlphaVolDevice, GetVolumeMountMap(goodVolumeMounts), vols, field.NewPath("field")); len(errs) == 0 {
51825142
t.Errorf("expected failure: %v", errs)
51835143
}

0 commit comments

Comments
 (0)