github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56168 from screeley44/fix-toggle-bug

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 55340, 55329, 56168, 56170, 56105). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fixing issue of feature gate not being turned off properly

Fixes #56166 

Adding proper defer and toggle of feature gate for BlockVolume support
This commit is contained in:
Kubernetes Submit Queue 2017-11-21 18:56:34 -08:00 committed by GitHub
commit d5bc9a4164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/volume/persistentvolume/binder_test.go
View File

@ -720,14 +720,9 @@ func TestSyncAlphaBlockVolume(t *testing.T) {
t.Errorf("Failed to enable feature gate for BlockVolume: %v", err) t.Errorf("Failed to enable feature gate for BlockVolume: %v", err)
return return
} }
defer utilfeature.DefaultFeatureGate.Set("BlockVolume=false")
runSyncTests(t, tests, []*storage.StorageClass{}) runSyncTests(t, tests, []*storage.StorageClass{})
err1 := utilfeature.DefaultFeatureGate.Set("BlockVolume=false")
if err1 != nil {
t.Errorf("Failed to disable feature gate for BlockVolume: %v", err)
return
}
} }
// Test multiple calls to syncClaim/syncVolume and periodic sync of all // Test multiple calls to syncClaim/syncVolume and periodic sync of all

5
pkg/controller/volume/persistentvolume/index_test.go
View File

@ -839,6 +839,8 @@ func TestAlphaVolumeModeCheck(t *testing.T) {
} }
} }
// make sure feature gate is turned off
toggleBlockVolumeFeature(false, t)
} }
func TestAlphaFilteringVolumeModes(t *testing.T) { func TestAlphaFilteringVolumeModes(t *testing.T) {
@ -933,6 +935,9 @@ func TestAlphaFilteringVolumeModes(t *testing.T) {
t.Errorf("Unexpected failure for scenario: %s - %+v", name, err) t.Errorf("Unexpected failure for scenario: %s - %+v", name, err)
} }
} }
// make sure feature gate is turned off
toggleBlockVolumeFeature(false, t)
} }
func TestFindingPreboundVolumes(t *testing.T) { func TestFindingPreboundVolumes(t *testing.T) {