diff --git a/pkg/apis/core/helper/helpers.go b/pkg/apis/core/helper/helpers.go index 3dbb49993ea..d58e87bc234 100644 --- a/pkg/apis/core/helper/helpers.go +++ b/pkg/apis/core/helper/helpers.go @@ -307,13 +307,13 @@ func IsStandardFinalizerName(str string) bool { func GetAccessModesAsString(modes []core.PersistentVolumeAccessMode) string { modes = removeDuplicateAccessModes(modes) modesStr := []string{} - if containsAccessMode(modes, core.ReadWriteOnce) { + if ContainsAccessMode(modes, core.ReadWriteOnce) { modesStr = append(modesStr, "RWO") } - if containsAccessMode(modes, core.ReadOnlyMany) { + if ContainsAccessMode(modes, core.ReadOnlyMany) { modesStr = append(modesStr, "ROX") } - if containsAccessMode(modes, core.ReadWriteMany) { + if ContainsAccessMode(modes, core.ReadWriteMany) { modesStr = append(modesStr, "RWX") } return strings.Join(modesStr, ",") @@ -341,14 +341,14 @@ func GetAccessModesFromString(modes string) []core.PersistentVolumeAccessMode { func removeDuplicateAccessModes(modes []core.PersistentVolumeAccessMode) []core.PersistentVolumeAccessMode { accessModes := []core.PersistentVolumeAccessMode{} for _, m := range modes { - if !containsAccessMode(accessModes, m) { + if !ContainsAccessMode(accessModes, m) { accessModes = append(accessModes, m) } } return accessModes } -func containsAccessMode(modes []core.PersistentVolumeAccessMode, mode core.PersistentVolumeAccessMode) bool { +func ContainsAccessMode(modes []core.PersistentVolumeAccessMode, mode core.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true diff --git a/pkg/apis/core/helper/helpers_test.go b/pkg/apis/core/helper/helpers_test.go index 6b95876d94e..86c47e01bc1 100644 --- a/pkg/apis/core/helper/helpers_test.go +++ b/pkg/apis/core/helper/helpers_test.go @@ -87,23 +87,23 @@ func TestIsStandardContainerResource(t *testing.T) { func TestGetAccessModesFromString(t *testing.T) { modes := GetAccessModesFromString("ROX") - if !containsAccessMode(modes, core.ReadOnlyMany) { + if !ContainsAccessMode(modes, core.ReadOnlyMany) { t.Errorf("Expected mode %s, but got %+v", core.ReadOnlyMany, modes) } 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) } - if !containsAccessMode(modes, core.ReadWriteMany) { + if !ContainsAccessMode(modes, core.ReadWriteMany) { t.Errorf("Expected mode %s, but got %+v", core.ReadWriteMany, modes) } 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) } - if !containsAccessMode(modes, core.ReadWriteMany) { + if !ContainsAccessMode(modes, core.ReadWriteMany) { t.Errorf("Expected mode %s, but got %+v", core.ReadWriteMany, modes) } } diff --git a/pkg/apis/core/v1/helper/helpers.go b/pkg/apis/core/v1/helper/helpers.go index 53446fff9b3..372aaa064ad 100644 --- a/pkg/apis/core/v1/helper/helpers.go +++ b/pkg/apis/core/v1/helper/helpers.go @@ -174,13 +174,13 @@ func ingressEqual(lhs, rhs *v1.LoadBalancerIngress) bool { func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string { modes = removeDuplicateAccessModes(modes) modesStr := []string{} - if containsAccessMode(modes, v1.ReadWriteOnce) { + if ContainsAccessMode(modes, v1.ReadWriteOnce) { modesStr = append(modesStr, "RWO") } - if containsAccessMode(modes, v1.ReadOnlyMany) { + if ContainsAccessMode(modes, v1.ReadOnlyMany) { modesStr = append(modesStr, "ROX") } - if containsAccessMode(modes, v1.ReadWriteMany) { + if ContainsAccessMode(modes, v1.ReadWriteMany) { modesStr = append(modesStr, "RWX") } return strings.Join(modesStr, ",") @@ -208,14 +208,14 @@ func GetAccessModesFromString(modes string) []v1.PersistentVolumeAccessMode { func removeDuplicateAccessModes(modes []v1.PersistentVolumeAccessMode) []v1.PersistentVolumeAccessMode { accessModes := []v1.PersistentVolumeAccessMode{} for _, m := range modes { - if !containsAccessMode(accessModes, m) { + if !ContainsAccessMode(accessModes, m) { accessModes = append(accessModes, m) } } return accessModes } -func containsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool { +func ContainsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true diff --git a/pkg/apis/core/v1/helper/helpers_test.go b/pkg/apis/core/v1/helper/helpers_test.go index db10d288036..77087386939 100644 --- a/pkg/apis/core/v1/helper/helpers_test.go +++ b/pkg/apis/core/v1/helper/helpers_test.go @@ -213,23 +213,23 @@ func TestIsOvercommitAllowed(t *testing.T) { func TestGetAccessModesFromString(t *testing.T) { modes := GetAccessModesFromString("ROX") - if !containsAccessMode(modes, v1.ReadOnlyMany) { + if !ContainsAccessMode(modes, v1.ReadOnlyMany) { t.Errorf("Expected mode %s, but got %+v", v1.ReadOnlyMany, modes) } 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) } - if !containsAccessMode(modes, v1.ReadWriteMany) { + if !ContainsAccessMode(modes, v1.ReadWriteMany) { t.Errorf("Expected mode %s, but got %+v", v1.ReadWriteMany, modes) } 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) } - if !containsAccessMode(modes, v1.ReadWriteMany) { + if !ContainsAccessMode(modes, v1.ReadWriteMany) { t.Errorf("Expected mode %s, but got %+v", v1.ReadWriteMany, modes) } } diff --git a/staging/src/k8s.io/kubectl/pkg/util/storage/storage.go b/staging/src/k8s.io/kubectl/pkg/util/storage/storage.go index b584a4da867..9c2194dd6a9 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/storage/storage.go +++ b/staging/src/k8s.io/kubectl/pkg/util/storage/storage.go @@ -49,13 +49,13 @@ func IsDefaultAnnotationText(obj metav1.ObjectMeta) string { func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string { modes = removeDuplicateAccessModes(modes) modesStr := []string{} - if containsAccessMode(modes, v1.ReadWriteOnce) { + if ContainsAccessMode(modes, v1.ReadWriteOnce) { modesStr = append(modesStr, "RWO") } - if containsAccessMode(modes, v1.ReadOnlyMany) { + if ContainsAccessMode(modes, v1.ReadOnlyMany) { modesStr = append(modesStr, "ROX") } - if containsAccessMode(modes, v1.ReadWriteMany) { + if ContainsAccessMode(modes, v1.ReadWriteMany) { modesStr = append(modesStr, "RWX") } return strings.Join(modesStr, ",") @@ -65,14 +65,14 @@ func GetAccessModesAsString(modes []v1.PersistentVolumeAccessMode) string { func removeDuplicateAccessModes(modes []v1.PersistentVolumeAccessMode) []v1.PersistentVolumeAccessMode { accessModes := []v1.PersistentVolumeAccessMode{} for _, m := range modes { - if !containsAccessMode(accessModes, m) { + if !ContainsAccessMode(accessModes, m) { accessModes = append(accessModes, m) } } return accessModes } -func containsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool { +func ContainsAccessMode(modes []v1.PersistentVolumeAccessMode, mode v1.PersistentVolumeAccessMode) bool { for _, m := range modes { if m == mode { return true