Merge pull request #84 from davidz627/feature/RePDNoParams

Regional PD Implementation [Removing parameter "zone"]

Author: k8s-ci-robot

Diff for: Gopkg.lock

@@ -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: cmd/main.go

@@ -46,14 +46,9 @@ spec:
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
-            - "--nodeid=$(KUBE_NODE_NAME)"
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
-            - name: KUBE_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
             - name: GOOGLE_APPLICATION_CREDENTIALS
               value: "/etc/cloud-sa/cloud-sa.json"
           volumeMounts:

Diff for: deploy/kubernetes/controller.yaml

@@ -11,5 +11,7 @@ readonly KUBEDEPLOY="${PKGDIR}/deploy/kubernetes"
 
 kubectl delete -f "${KUBEDEPLOY}/node.yaml" --ignore-not-found
 kubectl delete -f "${KUBEDEPLOY}/controller.yaml" --ignore-not-found
+kubectl delete -f "${KUBEDEPLOY}/zonal-sc.yaml" --ignore-not-found
+kubectl delete -f "${KUBEDEPLOY}/regional-sc.yaml" --ignore-not-found
 kubectl delete -f "${KUBEDEPLOY}/setup-cluster.yaml" --ignore-not-found
 kubectl delete secret cloud-sa --ignore-not-found

Diff for: deploy/kubernetes/delete-driver.sh

@@ -28,5 +28,6 @@ then
 fi
 
 kubectl apply -f "${KUBEDEPLOY}/setup-cluster.yaml"
+kubectl apply -f "${KUBEDEPLOY}/zonal-sc.yaml"
 kubectl apply -f "${KUBEDEPLOY}/node.yaml"
 kubectl apply -f "${KUBEDEPLOY}/controller.yaml"

Diff for: deploy/kubernetes/deploy-driver.sh

@@ -40,14 +40,9 @@ spec:
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"
-            - "--nodeid=$(KUBE_NODE_NAME)"
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock
-            - name: KUBE_NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
           volumeMounts:
             - name: kubelet-dir
               mountPath: /var/lib/kubelet

Diff for: deploy/kubernetes/node.yaml

@@ -0,0 +1,9 @@
+apiVersion: storage.k8s.io/v1beta1
+kind: StorageClass
+metadata:
+  name: csi-gce-pd
+provisioner: csi-gce-pd
+parameters:
+  type: pd-standard
+  replication-type: regional-pd
+volumeBindingMode: Immediate

Diff for: deploy/kubernetes/regional-sc.yaml

@@ -1,14 +1,3 @@
-apiVersion: storage.k8s.io/v1beta1
-kind: StorageClass
-metadata:
-  name: csi-gce-pd
-provisioner: csi-gce-pd
-parameters:
-  type: pd-standard
-volumeBindingMode: Immediate
-
----
-
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:

Diff for: deploy/kubernetes/setup-cluster.yaml

@@ -0,0 +1,8 @@
+apiVersion: storage.k8s.io/v1beta1
+kind: StorageClass
+metadata:
+  name: csi-gce-pd
+provisioner: csi-gce-pd
+parameters:
+  type: pd-standard
+volumeBindingMode: Immediate

Diff for: deploy/kubernetes/zonal-sc.yaml

@@ -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/constants.go

@@ -19,6 +19,25 @@ package common
 import (
 	"fmt"
 	"strings"
+
+	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta"
+)
+
+const (
+	// Volume ID Expected Format
+	// "projects/{projectName}/zones/{zoneName}/disks/{diskName}"
+	// "projects/{projectName}/regions/{regionName}/disks/{diskName}"
+	volIDToplogyKey    = 2
+	volIDToplogyValue  = 3
+	volIDDiskNameValue = 5
+	volIDTotalElements = 6
+
+	// Node ID Expected Format
+	// "{zoneName}/{instanceName}"
+	nodeIDZoneValue     = 0
+	nodeIDNameValue     = 1
+	nodeIDTotalElements = 2
 )
 
 func BytesToGb(bytes int64) int64 {
@@ -31,14 +50,43 @@ 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[volIDToplogyKey])
+	}
+}
+
+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) {
+	regions := sets.String{}
+	if len(zones) < 1 {
+		return "", fmt.Errorf("no zones specified")
+	}
+	for _, zone := range zones {
+		// 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)
+		}
+		regions.Insert(strings.Join(splitZone[0:2], "-"))
+	}
+	if regions.Len() != 1 {
+		return "", fmt.Errorf("multiple or no regions gotten from zones, got: %v", regions)
+	}
+	return regions.UnsortedList()[0], nil
 }