github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 07:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Update matching logic with storage class

Browse Source 
- no default StorageClass
- PVC.Spec.Class == nil means the same as PVC.Spec.Class == ""
This commit is contained in:
Jan Safranek
2016-08-18 10:36:50 +02:00
parent f6fb99b2fd
commit d8a95a3785
7 changed files with 133 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/controller/volume/persistentvolume/provision_test.go
View File

@@ -81,7 +81,7 @@ var provision2Success = provisionCall{
func TestProvisionSync(t *testing.T) {
tests := []controllerTest{
{
// Provision a volume (with the default class)
// Provision a volume (with a default class)
"11-1 - successful provision with storage class 1",
novolumes,
newVolumeArray("pvc-uid11-1", "1Gi", "uid11-1", "claim11-1", api.VolumeBound, api.PersistentVolumeReclaimDelete, annBoundByController, annDynamicallyProvisioned, annClass),
@@ -292,6 +292,24 @@ func TestProvisionSync(t *testing.T) {
claimWithClass("non-existing", newClaimArray("claim11-14", "uid11-14", "1Gi", "", api.ClaimPending)),
noevents, noerrors, wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim),
},
{
// No provisioning with class=""
"11-15 - no provisioning with class=''",
novolumes,
novolumes,
claimWithClass("", newClaimArray("claim11-15", "uid11-15", "1Gi", "", api.ClaimPending)),
claimWithClass("", newClaimArray("claim11-15", "uid11-15", "1Gi", "", api.ClaimPending)),
noevents, noerrors, wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim),
},
{
// No provisioning with class=nil
"11-16 - no provisioning with class=nil",
novolumes,
novolumes,
newClaimArray("claim11-15", "uid11-15", "1Gi", "", api.ClaimPending),
newClaimArray("claim11-15", "uid11-15", "1Gi", "", api.ClaimPending),
noevents, noerrors, wrapTestWithProvisionCalls([]provisionCall{}, testSyncClaim),
},
}
runSyncTests(t, tests, storageClasses)
}