github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-03 23:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Move LabelMultiZoneDelimiter to pkg/volume/util

Browse Source 
Change-Id: I098b210e44ac3bb1901e029ff7cd33aa0afbdc74
This commit is contained in:
Davanum Srinivas
2019-02-03 11:55:20 -05:00
parent 274c9976d2
commit cf44bfa556
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/volume/util/util.go
View File

@@ -73,6 +73,9 @@ const (
// VolumeDynamicallyCreatedByKey is the key of the annotation on PersistentVolume
// object created dynamically
VolumeDynamicallyCreatedByKey = "kubernetes.io/createdby"
// LabelMultiZoneDelimiter separates zones for volumes
LabelMultiZoneDelimiter = "__"
)
// VolumeZoneConfig contains config information about zonal volume.
@@ -329,7 +332,7 @@ func ZonesFromAllowedTopologies(allowedTopologies []v1.TopologySelectorTerm) (se
// ZonesSetToLabelValue converts zones set to label value
func ZonesSetToLabelValue(strSet sets.String) string {
return strings.Join(strSet.UnsortedList(), v1.LabelMultiZoneDelimiter)
return strings.Join(strSet.UnsortedList(), LabelMultiZoneDelimiter)
}
// ZonesToSet converts a string containing a comma separated list of zones to set
@@ -343,7 +346,7 @@ func ZonesToSet(zonesString string) (sets.String, error) {
// LabelZonesToSet converts a PV label value from string containing a delimited list of zones to set
func LabelZonesToSet(labelZonesValue string) (sets.String, error) {
return stringToSet(labelZonesValue, v1.LabelMultiZoneDelimiter)
return stringToSet(labelZonesValue, LabelMultiZoneDelimiter)
}
// StringToSet converts a string containing list separated by specified delimiter to a set
@@ -365,7 +368,7 @@ func stringToSet(str, delimiter string) (sets.String, error) {
// LabelZonesToList converts a PV label value from string containing a delimited list of zones to list
func LabelZonesToList(labelZonesValue string) ([]string, error) {
return stringToList(labelZonesValue, v1.LabelMultiZoneDelimiter)
return stringToList(labelZonesValue, LabelMultiZoneDelimiter)
}
// StringToList converts a string containing list separated by specified delimiter to a list