Regional PD Implementation

Author: davidz627

Diff for: cmd/main.go

@@ -35,7 +35,6 @@ func init() {
 var (
 	endpoint      = flag.String("endpoint", "unix:/tmp/csi.sock", "CSI endpoint")
 	driverName    = flag.String("drivername", "com.google.csi.gcepd", "name of the driver")
-	nodeID        = flag.String("nodeid", "", "node id")
 	vendorVersion string
 )
 
@@ -50,7 +49,7 @@ func handle() {
 	if vendorVersion == "" {
 		glog.Fatalf("vendorVersion must be set at compile time")
 	}
-	glog.Infof("Driver vendor version %v", vendorVersion)
+	glog.V(4).Infof("Driver vendor version %v", vendorVersion)
 
 	gceDriver := driver.GetGCEDriver()
 
@@ -68,7 +67,7 @@ func handle() {
 		glog.Fatalf("Failed to set up metadata service: %v", err)
 	}
 
-	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, deviceUtils, ms, *driverName, *nodeID, vendorVersion)
+	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, deviceUtils, ms, *driverName, vendorVersion)
 	if err != nil {
 		glog.Fatalf("Failed to initialize GCE CSI Driver: %v", err)
 	}

Diff for: pkg/common/constants.go

@@ -18,8 +18,8 @@ package common
 
 const (
 	// Keys for Storage Class Parameters
-	ParameterKeyZone = "zone"
-	ParameterKeyType = "type"
+	ParameterKeyType            = "type"
+	ParameterKeyReplicationType = "replication-type"
 
 	// Keys for Topology. This key will be shared amonst drivers from GCP
 	TopologyKeyZone = "com.google.topology/zone"

Diff for: pkg/common/utils.go

@@ -19,6 +19,21 @@ package common
 import (
 	"fmt"
 	"strings"
+
+	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta"
+)
+
+const (
+	volIDFmt = "projects/%s/zones/%s/disks/{}"
+
+	volIDToplogyKey    = 2
+	volIDToplogyValue  = 3
+	volIDDiskNameValue = 5
+	volIDTotalElements = 6
+
+	nodeIDZoneValue     = 0
+	nodeIDNameValue     = 1
+	nodeIDTotalElements = 2
 )
 
 func BytesToGb(bytes int64) int64 {
@@ -31,14 +46,41 @@ func GbToBytes(Gb int64) int64 {
 	return Gb * 1024 * 1024 * 1024
 }
 
-func SplitZoneNameId(id string) (string, string, error) {
+func VolumeIDToKey(id string) (*meta.Key, error) {
+	splitId := strings.Split(id, "/")
+	if len(splitId) != volIDTotalElements {
+		return nil, fmt.Errorf("failed to get id components. Expected projects/{project}/zones/{zone}/disks/{name}. Got: %s", id)
+	}
+	if splitId[volIDToplogyKey] == "zones" {
+		return meta.ZonalKey(splitId[volIDDiskNameValue], splitId[volIDToplogyValue]), nil
+	} else if splitId[volIDToplogyKey] == "regions" {
+		return meta.RegionalKey(splitId[volIDDiskNameValue], splitId[volIDToplogyValue]), nil
+	} else {
+		return nil, fmt.Errorf("could not get id components, expected either zones or regions, got: %v", splitId[2])
+	}
+}
+
+func NodeIDToZoneAndName(id string) (string, string, error) {
 	splitId := strings.Split(id, "/")
-	if len(splitId) != 2 {
-		return "", "", fmt.Errorf("Failed to get id components. Expected {zone}/{name}. Got: %s", id)
+	if len(splitId) != nodeIDTotalElements {
+		return "", "", fmt.Errorf("failed to get id components. expected {zone}/{name}. Got: %s", id)
 	}
-	return splitId[0], splitId[1], nil
+	return splitId[nodeIDZoneValue], splitId[nodeIDNameValue], nil
 }
 
 func CombineVolumeId(zone, name string) string {
 	return fmt.Sprintf("%s/%s", zone, name)
 }
+
+func GetRegionFromZones(zones []string) (string, error) {
+	if len(zones) < 1 {
+		return "", fmt.Errorf("no zones specified")
+	}
+	zone := zones[0]
+	// Zone expected format {locale}-{region}-{zone}
+	splitZone := strings.Split(zone, "-")
+	if len(splitZone) != 3 {
+		return "", fmt.Errorf("zone in unexpected format, expected: {locale}-{region}-{zone}, got: %v", zone)
+	}
+	return strings.Join(splitZone[0:2], "-"), nil
+}

Diff for: pkg/gce-cloud-provider/compute/cloud-disk.go

@@ -0,0 +1,125 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package gcecloudprovider
+
+import (
+	computebeta "google.golang.org/api/compute/v0.beta"
+	compute "google.golang.org/api/compute/v1"
+)
+
+type CloudDisk struct {
+	ZonalDisk    *compute.Disk
+	RegionalDisk *computebeta.Disk
+}
+
+type CloudDiskType string
+
+const (
+	// Zonal key type.
+	Zonal = "zonal"
+	// Regional key type.
+	Regional = "regional"
+	// Global key type.
+	Global = "global"
+)
+
+func ZonalCloudDisk(disk *compute.Disk) *CloudDisk {
+	return &CloudDisk{
+		ZonalDisk: disk,
+	}
+}
+
+func RegionalCloudDisk(disk *computebeta.Disk) *CloudDisk {
+	return &CloudDisk{
+		RegionalDisk: disk,
+	}
+}
+
+func (d *CloudDisk) Type() CloudDiskType {
+	switch {
+	case d.ZonalDisk != nil:
+		return Zonal
+	case d.RegionalDisk != nil:
+		return Regional
+	default:
+		return Global
+	}
+}
+
+func (d *CloudDisk) GetUsers() []string {
+	switch d.Type() {
+	case Zonal:
+		return d.ZonalDisk.Users
+	case Regional:
+		return d.RegionalDisk.Users
+	default:
+		return nil
+	}
+}
+
+func (d *CloudDisk) GetName() string {
+	switch d.Type() {
+	case Zonal:
+		return d.ZonalDisk.Name
+	case Regional:
+		return d.RegionalDisk.Name
+	default:
+		return ""
+	}
+}
+
+func (d *CloudDisk) GetKind() string {
+	switch d.Type() {
+	case Zonal:
+		return d.ZonalDisk.Kind
+	case Regional:
+		return d.RegionalDisk.Kind
+	default:
+		return ""
+	}
+}
+
+func (d *CloudDisk) GetType() string {
+	switch d.Type() {
+	case Zonal:
+		return d.ZonalDisk.Type
+	case Regional:
+		return d.RegionalDisk.Type
+	default:
+		return ""
+	}
+}
+
+func (d *CloudDisk) GetSelfLink() string {
+	switch d.Type() {
+	case Zonal:
+		return d.ZonalDisk.SelfLink
+	case Regional:
+		return d.RegionalDisk.SelfLink
+	default:
+		return ""
+	}
+}
+
+func (d *CloudDisk) GetSizeGb() int64 {
+	switch d.Type() {
+	case Zonal:
+		return d.ZonalDisk.SizeGb
+	case Regional:
+		return d.RegionalDisk.SizeGb
+	default:
+		return -1
+	}
+}