github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

volume binder: test different CSIStorageCapacity/CSIDriver combinations

Browse Source 
When the feature is disabled either in the scheduler or the CSIDriver,
the scheduler is expected to schedule pods without considering whether
storage capacity is available.
This commit is contained in:
Patrick Ohly 2021-03-02 11:01:00 +01:00
parent 35c233f18d
commit e98c40a6f9
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/controller/volume/scheduling/scheduler_binder_test.go
View File

@ -2201,14 +2201,14 @@ func TestCapacity(t *testing.T) {
}, },
} }
run := func(t *testing.T, scenario scenarioType) { run := func(t *testing.T, scenario scenarioType, featureEnabled, optIn bool) {
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.CSIStorageCapacity, featureEnabled)()
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
// Setup // Setup: the driver has the feature enabled, but the scheduler might not.
withCSIStorageCapacity := true testEnv := newTestBinder(t, ctx.Done(), featureEnabled)
testEnv := newTestBinder(t, ctx.Done(), withCSIStorageCapacity) testEnv.addCSIDriver(makeCSIDriver(provisioner, optIn))
testEnv.addCSIDriver(makeCSIDriver(provisioner, withCSIStorageCapacity))
testEnv.addCSIStorageCapacities(scenario.capacities) testEnv.addCSIStorageCapacities(scenario.capacities)
// a. Init pvc cache // a. Init pvc cache
@ -2221,13 +2221,19 @@ func TestCapacity(t *testing.T) {
podVolumes, reasons, err := findPodVolumes(testEnv.binder, pod, testNode) podVolumes, reasons, err := findPodVolumes(testEnv.binder, pod, testNode)
// Validate // Validate
if !scenario.shouldFail && err != nil { shouldFail := scenario.shouldFail
expectedReasons := scenario.reasons
if !featureEnabled || !optIn {
shouldFail = false
expectedReasons = nil
}
if !shouldFail && err != nil {
t.Errorf("returned error: %v", err) t.Errorf("returned error: %v", err)
} }
if scenario.shouldFail && err == nil { if shouldFail && err == nil {
t.Error("returned success but expected error") t.Error("returned success but expected error")
} }
checkReasons(t, reasons, scenario.reasons) checkReasons(t, reasons, expectedReasons)
provisions := scenario.pvcs provisions := scenario.pvcs
if len(reasons) > 0 { if len(reasons) > 0 {
provisions = nil provisions = nil
@ -2235,7 +2241,18 @@ func TestCapacity(t *testing.T) {
testEnv.validatePodCache(t, pod.Spec.NodeName, pod, podVolumes, nil, provisions) testEnv.validatePodCache(t, pod.Spec.NodeName, pod, podVolumes, nil, provisions)
} }
for name, scenario := range scenarios { yesNo := []bool{true, false}
t.Run(name, func(t *testing.T) { run(t, scenario) }) for _, featureEnabled := range yesNo {
name := fmt.Sprintf("CSIStorageCapacity=%v", featureEnabled)
t.Run(name, func(t *testing.T) {
for _, optIn := range yesNo {
name := fmt.Sprintf("CSIDriver.StorageCapacity=%v", optIn)
t.Run(name, func(t *testing.T) {
for name, scenario := range scenarios {
t.Run(name, func(t *testing.T) { run(t, scenario, featureEnabled, optIn) })
}
})
}
})
} }
} }