diff --git a/pkg/volume/gcepd/attacher_test.go b/pkg/volume/gcepd/attacher_test.go index 929157e0c0..9ab284d009 100644 --- a/pkg/volume/gcepd/attacher_test.go +++ b/pkg/volume/gcepd/attacher_test.go @@ -26,6 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kubernetes/pkg/volume" volumetest "k8s.io/kubernetes/pkg/volume/testing" + volumeutil "k8s.io/kubernetes/pkg/volume/util" "k8s.io/apimachinery/pkg/types" "k8s.io/klog" @@ -283,7 +284,7 @@ func createPVSpec(name string, readOnly bool, zones []string) *volume.Spec { } if zones != nil { - zonesLabel := strings.Join(zones, v1.LabelMultiZoneDelimiter) + zonesLabel := strings.Join(zones, volumeutil.LabelMultiZoneDelimiter) spec.PersistentVolume.ObjectMeta.Labels = map[string]string{ v1.LabelZoneFailureDomain: zonesLabel, } diff --git a/pkg/volume/gcepd/gce_util.go b/pkg/volume/gcepd/gce_util.go index 876bf201e9..a1cb2cf9ed 100644 --- a/pkg/volume/gcepd/gce_util.go +++ b/pkg/volume/gcepd/gce_util.go @@ -354,7 +354,7 @@ func udevadmChangeToDrive(drivePath string) error { func isRegionalPD(spec *volume.Spec) bool { if spec.PersistentVolume != nil { zonesLabel := spec.PersistentVolume.Labels[v1.LabelZoneFailureDomain] - zones := strings.Split(zonesLabel, v1.LabelMultiZoneDelimiter) + zones := strings.Split(zonesLabel, volumeutil.LabelMultiZoneDelimiter) return len(zones) > 1 } return false diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go index 41bf22dcdf..21c1956bcb 100644 --- a/pkg/volume/util/util.go +++ b/pkg/volume/util/util.go @@ -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 diff --git a/staging/src/k8s.io/api/core/v1/well_known_labels.go b/staging/src/k8s.io/api/core/v1/well_known_labels.go index aacf654fa6..8b05c0ce7d 100644 --- a/staging/src/k8s.io/api/core/v1/well_known_labels.go +++ b/staging/src/k8s.io/api/core/v1/well_known_labels.go @@ -17,10 +17,9 @@ limitations under the License. package v1 const ( - LabelHostname = "kubernetes.io/hostname" - LabelZoneFailureDomain = "failure-domain.beta.kubernetes.io/zone" - LabelMultiZoneDelimiter = "__" - LabelZoneRegion = "failure-domain.beta.kubernetes.io/region" + LabelHostname = "kubernetes.io/hostname" + LabelZoneFailureDomain = "failure-domain.beta.kubernetes.io/zone" + LabelZoneRegion = "failure-domain.beta.kubernetes.io/region" LabelInstanceType = "beta.kubernetes.io/instance-type"