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

Export contains access mode helper method

Browse Source 
Will be used during validation of PVs and PVCs
This commit is contained in:
Chris Henzie 2021-06-14 19:31:57 -07:00
parent 83e3ee780a
commit 358d2e0bd1
5 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/apis/core/helper/helpers.go
View File

@ -307,13 +307,13 @@ func IsStandardFinalizerName(str string) bool {
func GetAccessModesAsString(modes []core.PersistentVolumeAccessMode) string { func GetAccessModesAsString(modes []core.PersistentVolumeAccessMode) string {
modes = removeDuplicateAccessModes(modes) modes = removeDuplicateAccessModes(modes)
modesStr := []string{} modesStr := []string{}
if containsAccessMode(modes, core.ReadWriteOnce) { if ContainsAccessMode(modes, core.ReadWriteOnce) {
modesStr = append(modesStr, "RWO") modesStr = append(modesStr, "RWO")
} }
if containsAccessMode(modes, core.ReadOnlyMany) { if ContainsAccessMode(modes, core.ReadOnlyMany) {
modesStr = append(modesStr, "ROX") modesStr = append(modesStr, "ROX")
} }
if containsAccessMode(modes, core.ReadWriteMany) { if ContainsAccessMode(modes, core.ReadWriteMany) {
modesStr = append(modesStr, "RWX") modesStr = append(modesStr, "RWX")
} }
return strings.Join(modesStr, ",") return strings.Join(modesStr, ",")
@ -341,14 +341,14 @@ func GetAccessModesFromString(modes string) []core.PersistentVolumeAccessMode {
func removeDuplicateAccessModes(modes []core.PersistentVolumeAccessMode) []core.PersistentVolumeAccessMode { func removeDuplicateAccessModes(modes []core.PersistentVolumeAccessMode) []core.PersistentVolumeAccessMode {
accessModes := []core.PersistentVolumeAccessMode{} accessModes := []core.PersistentVolumeAccessMode{}
for _, m := range modes { for _, m := range modes {
if !containsAccessMode(accessModes, m) { if !ContainsAccessMode(accessModes, m) {
accessModes = append(accessModes, m) accessModes = append(accessModes, m)
} }
} }
return accessModes return accessModes
} }
func containsAccessMode(modes []core.PersistentVolumeAccessMode, mode core.PersistentVolumeAccessMode) bool { func ContainsAccessMode(modes []core.PersistentVolumeAccessMode, mode core.PersistentVolumeAccessMode) bool {
for _, m := range modes { for _, m := range modes {
if m == mode { if m == mode {
return true return true

10
pkg/apis/core/helper/helpers_test.go
View File

@ -87,23 +87,23 @@ func TestIsStandardContainerResource(t *testing.T) {
func TestGetAccessModesFromString(t *testing.T) { func TestGetAccessModesFromString(t *testing.T) {
modes := GetAccessModesFromString("ROX") modes := GetAccessModesFromString("ROX")
if !containsAccessMode(modes, core.ReadOnlyMany) { if !ContainsAccessMode(modes, core.ReadOnlyMany) {
t.Errorf("Expected mode %s, but got %+v", core.ReadOnlyMany, modes) t.Errorf("Expected mode %s, but got %+v", core.ReadOnlyMany, modes)
} }
modes = GetAccessModesFromString("ROX,RWX") modes = GetAccessModesFromString("ROX,RWX")
if !containsAccessMode(modes, core.ReadOnlyMany) { if !ContainsAccessMode(modes, core.ReadOnlyMany) {
t.Errorf("Expected mode %s, but got %+v", core.ReadOnlyMany, modes) t.Errorf("Expected mode %s, but got %+v", core.ReadOnlyMany, modes)
} }
if !containsAccessMode(modes, core.ReadWriteMany) { if !ContainsAccessMode(modes, core.ReadWriteMany) {
t.Errorf("Expected mode %s, but got %+v", core.ReadWriteMany, modes) t.Errorf("Expected mode %s, but got %+v", core.ReadWriteMany, modes)
} }
modes = GetAccessModesFromString("RWO,ROX,RWX") modes = GetAccessModesFromString("RWO,ROX,RWX")
if !containsAccessMode(modes, core.ReadOnlyMany) { if !ContainsAccessMode(modes, core.ReadOnlyMany) {
t.Errorf("Expected mode %s, but got %+v", core.ReadOnlyMany, modes) t.Errorf("Expected mode %s, but got %+v", core.ReadOnlyMany, modes)
} }
if !containsAccessMode(modes, core.ReadWriteMany) { if !ContainsAccessMode(modes, core.ReadWriteMany) {
t.Errorf("Expected mode %s, but got %+v", core.ReadWriteMany, modes) t.Errorf("Expected mode %s, but got %+v", core.ReadWriteMany, modes)
} }
} }

10
pkg/apis/core/v1/helper/helpers.go
View File

@ -174,13 +174,13 @@ func ingressEqual(lhs, rhs *v1.LoadBalancerIngress) bool {
func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string { func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string {
modes = removeDuplicateAccessModes(modes) modes = removeDuplicateAccessModes(modes)
modesStr := []string{} modesStr := []string{}
if containsAccessMode(modes, v1.ReadWriteOnce) { if ContainsAccessMode(modes, v1.ReadWriteOnce) {
modesStr = append(modesStr, "RWO") modesStr = append(modesStr, "RWO")
} }
if containsAccessMode(modes, v1.ReadOnlyMany) { if ContainsAccessMode(modes, v1.ReadOnlyMany) {
modesStr = append(modesStr, "ROX") modesStr = append(modesStr, "ROX")
} }
if containsAccessMode(modes, v1.ReadWriteMany) { if ContainsAccessMode(modes, v1.ReadWriteMany) {
modesStr = append(modesStr, "RWX") modesStr = append(modesStr, "RWX")
} }
return strings.Join(modesStr, ",") return strings.Join(modesStr, ",")
@ -208,14 +208,14 @@ func GetAccessModesFromString(modes string) []v1.PersistentVolumeAccessMode {
func removeDuplicateAccessModes(modes []v1.PersistentVolumeAccessMode) []v1.PersistentVolumeAccessMode { func removeDuplicateAccessModes(modes []v1.PersistentVolumeAccessMode) []v1.PersistentVolumeAccessMode {
accessModes := []v1.PersistentVolumeAccessMode{} accessModes := []v1.PersistentVolumeAccessMode{}
for _, m := range modes { for _, m := range modes {
if !containsAccessMode(accessModes, m) { if !ContainsAccessMode(accessModes, m) {
accessModes = append(accessModes, m) accessModes = append(accessModes, m)
} }
} }
return accessModes return accessModes
} }
func containsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool { func ContainsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool {
for _, m := range modes { for _, m := range modes {
if m == mode { if m == mode {
return true return true

10
pkg/apis/core/v1/helper/helpers_test.go
View File

@ -213,23 +213,23 @@ func TestIsOvercommitAllowed(t *testing.T) {
func TestGetAccessModesFromString(t *testing.T) { func TestGetAccessModesFromString(t *testing.T) {
modes := GetAccessModesFromString("ROX") modes := GetAccessModesFromString("ROX")
if !containsAccessMode(modes, v1.ReadOnlyMany) { if !ContainsAccessMode(modes, v1.ReadOnlyMany) {
t.Errorf("Expected mode %s, but got %+v", v1.ReadOnlyMany, modes) t.Errorf("Expected mode %s, but got %+v", v1.ReadOnlyMany, modes)
} }
modes = GetAccessModesFromString("ROX,RWX") modes = GetAccessModesFromString("ROX,RWX")
if !containsAccessMode(modes, v1.ReadOnlyMany) { if !ContainsAccessMode(modes, v1.ReadOnlyMany) {
t.Errorf("Expected mode %s, but got %+v", v1.ReadOnlyMany, modes) t.Errorf("Expected mode %s, but got %+v", v1.ReadOnlyMany, modes)
} }
if !containsAccessMode(modes, v1.ReadWriteMany) { if !ContainsAccessMode(modes, v1.ReadWriteMany) {
t.Errorf("Expected mode %s, but got %+v", v1.ReadWriteMany, modes) t.Errorf("Expected mode %s, but got %+v", v1.ReadWriteMany, modes)
} }
modes = GetAccessModesFromString("RWO,ROX,RWX") modes = GetAccessModesFromString("RWO,ROX,RWX")
if !containsAccessMode(modes, v1.ReadOnlyMany) { if !ContainsAccessMode(modes, v1.ReadOnlyMany) {
t.Errorf("Expected mode %s, but got %+v", v1.ReadOnlyMany, modes) t.Errorf("Expected mode %s, but got %+v", v1.ReadOnlyMany, modes)
} }
if !containsAccessMode(modes, v1.ReadWriteMany) { if !ContainsAccessMode(modes, v1.ReadWriteMany) {
t.Errorf("Expected mode %s, but got %+v", v1.ReadWriteMany, modes) t.Errorf("Expected mode %s, but got %+v", v1.ReadWriteMany, modes)
} }
} }

10
staging/src/k8s.io/kubectl/pkg/util/storage/storage.go
View File

@ -49,13 +49,13 @@ func IsDefaultAnnotationText(obj metav1.ObjectMeta) string {
func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string { func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string {
modes = removeDuplicateAccessModes(modes) modes = removeDuplicateAccessModes(modes)
modesStr := []string{} modesStr := []string{}
if containsAccessMode(modes, v1.ReadWriteOnce) { if ContainsAccessMode(modes, v1.ReadWriteOnce) {
modesStr = append(modesStr, "RWO") modesStr = append(modesStr, "RWO")
} }
if containsAccessMode(modes, v1.ReadOnlyMany) { if ContainsAccessMode(modes, v1.ReadOnlyMany) {
modesStr = append(modesStr, "ROX") modesStr = append(modesStr, "ROX")
} }
if containsAccessMode(modes, v1.ReadWriteMany) { if ContainsAccessMode(modes, v1.ReadWriteMany) {
modesStr = append(modesStr, "RWX") modesStr = append(modesStr, "RWX")
} }
return strings.Join(modesStr, ",") return strings.Join(modesStr, ",")
@ -65,14 +65,14 @@ func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string {
func removeDuplicateAccessModes(modes []v1.PersistentVolumeAccessMode) []v1.PersistentVolumeAccessMode { func removeDuplicateAccessModes(modes []v1.PersistentVolumeAccessMode) []v1.PersistentVolumeAccessMode {
accessModes := []v1.PersistentVolumeAccessMode{} accessModes := []v1.PersistentVolumeAccessMode{}
for _, m := range modes { for _, m := range modes {
if !containsAccessMode(accessModes, m) { if !ContainsAccessMode(accessModes, m) {
accessModes = append(accessModes, m) accessModes = append(accessModes, m)
} }
} }
return accessModes return accessModes
} }
func containsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool { func ContainsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool {
for _, m := range modes { for _, m := range modes {
if m == mode { if m == mode {
return true return true