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

Rename access mode contains helper method

Browse Source 
So it is consistent with other methods performing the same check (one
for internal and external types)
This commit is contained in:
Chris Henzie
2021-06-14 17:14:25 -07:00
parent dba8ee229e
commit 83e3ee780a
15 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/volume/persistentvolume/index.go
View File

@@ -152,7 +152,7 @@ func (pvIndex *persistentVolumeOrderedIndex) allPossibleMatchingAccessModes(requ
keys := pvIndex.store.ListIndexFuncValues("accessmodes")
for _, key := range keys {
indexedModes := v1helper.GetAccessModesFromString(key)
if volumeutil.AccessModesContainedInAll(indexedModes, requestedModes) {
if volumeutil.ContainsAllAccessModes(indexedModes, requestedModes) {
matchedModes = append(matchedModes, indexedModes)
}
}

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

@@ -318,7 +318,7 @@ func TestAllPossibleAccessModes(t *testing.T) {
t.Errorf("Expected 3 arrays of modes that match RWO, but got %v", len(possibleModes))
}
for _, m := range possibleModes {
if !util.AccessModesContains(m, v1.ReadWriteOnce) {
if !util.ContainsAccessMode(m, v1.ReadWriteOnce) {
t.Errorf("AccessModes does not contain %s", v1.ReadWriteOnce)
}
}
@@ -327,7 +327,7 @@ func TestAllPossibleAccessModes(t *testing.T) {
if len(possibleModes) != 1 {
t.Errorf("Expected 1 array of modes that match RWX, but got %v", len(possibleModes))
}
if !util.AccessModesContains(possibleModes[0], v1.ReadWriteMany) {
if !util.ContainsAccessMode(possibleModes[0], v1.ReadWriteMany) {
t.Errorf("AccessModes does not contain %s", v1.ReadWriteOnce)
}