Switch to disk-type.gke.io topology label key

Author: julianKatz

cmd/gce-pd-csi-driver/main.go

@@ -94,7 +94,7 @@ var (
 
 	extraTagsStr = flag.String("extra-tags", "", "Extra tags to attach to each Compute Disk, Image, Snapshot created. It is a comma separated list of parent id, key and value like '<parent_id1>/<tag_key1>/<tag_value1>,...,<parent_idN>/<tag_keyN>/<tag_valueN>'. parent_id is the Organization or the Project ID or Project name where the tag key and the tag value resources exist. A maximum of 50 tags bindings is allowed for a resource. See https://cloud.google.com/resource-manager/docs/tags/tags-overview, https://cloud.google.com/resource-manager/docs/tags/tags-creating-and-managing for details")
 
-	diskTopology = flag.Bool("disk-topology", false, "If set to true, the driver will add a topology.gke.io/[disk-type] topology label to the Topologies returned in CreateVolumeResponse.  Label is only added if all cluster nodes have at least one disk support label")
+	diskTopology = flag.Bool("disk-topology", false, "If set to true, the driver will add a disk-type.gke.io/[some-disk-type] topology label to the Topologies returned in CreateVolumeResponse.")
 
 	version string
 )

pkg/common/constants.go

@@ -18,8 +18,11 @@ package common
 
 const (
 	// Keys for Topology. This key will be shared amongst drivers from GCP
-	TopologyKeyPrefix = "topology.gke.io"
-	TopologyKeyZone   = TopologyKeyPrefix + "/zone"
+	TopologyKeyZone = "topology.gke.io/zone"
+
+	// DiskTypeKeyPrefix is the prefix for the disk type label key used as part
+	// of the Disk Topology feature.
+	DiskTypeKeyPrefix = "disk-type.gke.io"
 
 	// VolumeAttributes for Partition
 	VolumeAttributePartition = "partition"

pkg/common/utils.go

@@ -765,10 +765,6 @@ func MapNumber(num int64) int64 {
 	return 0
 }
 
-func IsGKETopologyLabel(key string) bool {
-	return strings.HasPrefix(key, TopologyKeyPrefix)
-}
-
-func TopologyLabelKey(diskType string) string {
-	return fmt.Sprintf("%s/%s", TopologyKeyPrefix, diskType)
+func DiskTypeLabelKey(diskType string) string {
+	return fmt.Sprintf("%s/%s", DiskTypeKeyPrefix, diskType)
 }

pkg/gce-pd-csi-driver/controller.go

@@ -2419,7 +2419,7 @@ func (gceCS *GCEControllerServer) generateCreateVolumeResponseWithVolumeId(disk
 		}
 
 		if gceCS.EnableDiskTopology {
-			top.Segments[common.TopologyLabelKey(params.DiskType)] = "true"
+			top.Segments[common.DiskTypeLabelKey(params.DiskType)] = "true"
 		}
 
 		tops = append(tops, top)

pkg/gce-pd-csi-driver/controller_test.go

@@ -1366,7 +1366,7 @@ func TestCreateVolumeArguments(t *testing.T) {
 						Segments: map[string]string{
 							common.TopologyKeyZone: zone,
 							// Disk type is added as topology segment.
-							common.TopologyLabelKey(stdDiskType): "true",
+							common.DiskTypeLabelKey(stdDiskType): "true",
 						},
 					},
 				},