mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
pv_controller: update tests for multiple storageclasses
Signed-off-by: danishprakash <grafitykoncept@gmail.com>
This commit is contained in:
parent
f12325add3
commit
f10f4d372c
@ -773,23 +773,6 @@ func TestRetroactiveStorageClassAssignment(t *testing.T) {
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
storageClasses: []*storagev1.StorageClass{
|
||||
makeDefaultStorageClass(classGold, &modeImmediate),
|
||||
makeDefaultStorageClass(classSilver, &modeImmediate)},
|
||||
tests: []controllerTest{
|
||||
{
|
||||
name: "15-2 - pvc storage class is not assigned retroactively if there are multiple default storage classes",
|
||||
initialVolumes: novolumes,
|
||||
expectedVolumes: novolumes,
|
||||
initialClaims: newClaimArray("claim15-2", "uid15-2", "1Gi", "", v1.ClaimPending, nil),
|
||||
expectedClaims: newClaimArray("claim15-2", "uid15-2", "1Gi", "", v1.ClaimPending, nil),
|
||||
expectedEvents: noevents,
|
||||
errors: noerrors,
|
||||
test: testSyncClaim,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
storageClasses: []*storagev1.StorageClass{
|
||||
makeDefaultStorageClass(classGold, &modeImmediate),
|
||||
@ -844,6 +827,23 @@ func TestRetroactiveStorageClassAssignment(t *testing.T) {
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
storageClasses: []*storagev1.StorageClass{
|
||||
makeDefaultStorageClass(classGold, &modeImmediate),
|
||||
makeDefaultStorageClass(classSilver, &modeImmediate)},
|
||||
tests: []controllerTest{
|
||||
{
|
||||
name: "15-2 - pvc storage class is assigned retroactively if there are multiple default storage classes",
|
||||
initialVolumes: novolumes,
|
||||
expectedVolumes: novolumes,
|
||||
initialClaims: newClaimArray("claim15-2", "uid15-2", "1Gi", "", v1.ClaimPending, nil),
|
||||
expectedClaims: newClaimArray("claim15-2", "uid15-2", "1Gi", "", v1.ClaimPending, &classGold),
|
||||
expectedEvents: noevents,
|
||||
errors: noerrors,
|
||||
test: testSyncClaim,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
storageClasses: []*storagev1.StorageClass{
|
||||
makeDefaultStorageClass(classGold, &modeImmediate),
|
||||
|
@ -55,6 +55,8 @@ func GetDefaultClass(lister storagev1listers.StorageClassLister) (*storagev1.Sto
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// Primary sort by creation timestamp, newest first
|
||||
// Secondary sort by class name, ascending order
|
||||
sort.Slice(defaultClasses, func(i, j int) bool {
|
||||
if defaultClasses[i].CreationTimestamp.UnixNano() == defaultClasses[j].CreationTimestamp.UnixNano() {
|
||||
return defaultClasses[i].Name < defaultClasses[j].Name
|
||||
|
@ -20,7 +20,6 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
|
||||
"k8s.io/kubernetes/pkg/volume/util"
|
||||
|
||||
"k8s.io/klog/v2"
|
||||
|
Loading…
Reference in New Issue
Block a user