Merge branch 'disable-default-pd-csi-install' of github.com:leiyiz/gcp-compute-persistent-disk-csi-driver into disable-default-pd-csi-install

Author: leiyiz

README.md

@@ -33,19 +33,14 @@ This plugin is compatible with CSI versions [v1.2.0](https://github.com/containe
 The following table captures the compatibility matrix of the core persistent disk driver binary
 `gke.gcr.io/gcp-compute-persistent-disk-csi-driver`
 
-| GCE PD CSI Driver\Kubernetes Version | 1.15 | 1.16  | 1.17+ |
-|--------------------------------------|------|-------|-------|
-| v0.2.x (alpha)                       | no   | no    | no    |
-| v0.3.x (beta)                        | yes  | yes   | yes   |
-| v0.4.x (beta)                        | yes  | yes   | yes   |
-| v0.5.x (beta)                        | yes  | yes   | yes   |
-| v0.6.x (beta)                        | yes  | yes   | yes   |
-| v0.7.x (beta)                        | yes  | yes   | yes   |
-| v1.0.x (ga)                          | yes  | yes   | yes   |
-| dev                                  | yes  | yes   | yes   |
+| GCE PD CSI Driver\Kubernetes Version | 1.17+ |
+|--------------------------------------|-------|
+| v0.7.x (beta)                        | yes   |
+| v1.0.x (ga)                          | yes   |
+| dev                                  | yes   |
 
 The manifest bundle which captures all the driver components (driver pod which includes the containers csi-provisioner, csi-resizer, csi-snapshotter, gce-pd-driver, csi-driver-registrar;
-csi driver object, rbacs, pod security policies etc) can be picked up from the master branch [overlays](deploy/kubernetes/overlays) directory. We structure the overlays directory, per minor version of kubernetes because not all driver components can be used with all kubernetes versions. For example volume snapshots are supported 1.17+ kubernetes versions thus [stable-1-16](deploy/kubernetes/overlays/stable-1-16) driver manifests does not contain the snapshotter sidecar.
+csi driver object, rbacs, pod security policies etc) can be picked up from the master branch [overlays](deploy/kubernetes/overlays) directory. We structure the overlays directory, per minor version of kubernetes because not all driver components can be used with all kubernetes versions. For example, v1 CSIDriver resources are supported in 1.18+ only, so [stable-1-17](deploy/kubernetes/overlays/stable-1-17) driver manifests use the v1beta1 version.
 
 Example:
 
@@ -84,10 +79,8 @@ GCE PD driver starts to support CSI Windows with [CSI Proxy] (https://github.com
 
 | Feature         | Stage | Min Kubernetes Master Version | Min Kubernetes Nodes Version | Min Driver Version | Deployment Overlay |
 |-----------------|-------|-------------------------------|------------------------------|--------------------|--------------------|
-| Snapshots       | Alpha | 1.13                          | Any                          | v0.3.0             | Alpha              |
 | Snapshots       | Beta  | 1.17                          | Any                          | v1.0.0             | stable-1-17, stable-1-18, stable-1-19, stable-master |
-| Resize (Expand) | Alpha | 1.14                          | 1.14                         | v0.6.0             | Alpha              |
-| Resize (Expand) | Beta  | 1.16                          | 1.16                         | v0.7.0             | stable-1-16, stable-1-17, stable-1-18, stable-1-19, stable-master |
+| Resize (Expand) | Beta  | 1.16                          | 1.16                         | v0.7.0             | stable-1-17, stable-1-18, stable-1-19, stable-master |
 | Windows*        | Beta  | 1.18                          | 1.18                         | v1.1.0             | stable-1-18, stable-1-19, stable-master |
 
 \* For Windows, it is recommended to use this driver with CSI proxy v0.2.2+. The master version of driver requires disk v1beta2 group, which is only available in CSI proxy v0.2.2+

deploy/kubernetes/base/controller/kustomization.yaml

@@ -5,5 +5,5 @@ namespace:
 resources:
 - cluster_setup.yaml
 - controller.yaml
-- csidriver_info.yaml
 - psp.yaml
+- v1_csidriver.yaml

deploy/kubernetes/base/controller/v1_csidriver.yaml

@@ -0,0 +1,7 @@
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: pd.csi.storage.gke.io
+spec:
+  attachRequired: true
+  podInfoOnMount: false

deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-15/README.md

@@ -2,5 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - ../stable-1-17
+- v1beta1_csidriver.yaml
+patchesStrategicMerge:
+- no_v1_csidriver.yaml
 transformers:
 - ../../images/prow-gke-release-staging-rc-1-17

deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-15/kustomization.yaml

@@ -0,0 +1,5 @@
+$patch: delete
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: pd.csi.storage.gke.io

deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-16/README.md

@@ -1,4 +1,3 @@
-#### TODO: This need to be updated to v1 once we official support 1.18+
 apiVersion: storage.k8s.io/v1beta1
 kind: CSIDriver
 metadata:

deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-16/kustomization.yaml

@@ -5,7 +5,9 @@ namespace:
 resources:
 - ../../base/controller
 - ../../base/node_linux
+- v1beta1_csidriver.yaml
 patchesStrategicMerge:
 - no_win_roles.yaml
+- no_v1_csidriver.yaml
 transformers:
 - ../../images/stable-1-17

deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-17/kustomization.yaml

@@ -0,0 +1,5 @@
+$patch: delete
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: pd.csi.storage.gke.io

deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-17/no_v1_csidriver.yaml

@@ -0,0 +1,7 @@
+apiVersion: storage.k8s.io/v1beta1
+kind: CSIDriver
+metadata:
+  name: pd.csi.storage.gke.io
+spec:
+  attachRequired: true
+  podInfoOnMount: false

deploy/kubernetes/base/controller/csidriver_info.yaml renamed to deploy/kubernetes/overlays/prow-gke-release-staging-rc-1-17/v1beta1_csidriver.yaml

@@ -39,10 +39,12 @@ const (
 	// Snapshot ID
 	snapshotTotalElements = 5
 	snapshotTopologyKey   = 2
+	snapshotProjectKey    = 1
 
 	// Node ID Expected Format
 	// "projects/{projectName}/zones/{zoneName}/disks/{diskName}"
 	nodeIDFmt           = "projects/%s/zones/%s/instances/%s"
+	nodeIDProjectValue  = 1
 	nodeIDZoneValue     = 3
 	nodeIDNameValue     = 5
 	nodeIDTotalElements = 6
@@ -68,17 +70,17 @@ func GbToBytes(Gb int64) int64 {
 	return Gb * 1024 * 1024 * 1024
 }
 
-func VolumeIDToKey(id string) (*meta.Key, error) {
+func VolumeIDToKey(id string) (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)
+		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
+		return splitId[nodeIDProjectValue], meta.ZonalKey(splitId[volIDDiskNameValue], splitId[volIDToplogyValue]), nil
 	} else if splitId[volIDToplogyKey] == "regions" {
-		return meta.RegionalKey(splitId[volIDDiskNameValue], splitId[volIDToplogyValue]), nil
+		return splitId[nodeIDProjectValue], 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])
+		return "", nil, fmt.Errorf("could not get id components, expected either zones or regions, got: %v", splitId[volIDToplogyKey])
 	}
 }
 
@@ -100,15 +102,15 @@ func GenerateUnderspecifiedVolumeID(diskName string, isZonal bool) string {
 	return fmt.Sprintf(volIDRegionalFmt, UnspecifiedValue, UnspecifiedValue, diskName)
 }
 
-func SnapshotIDToKey(id string) (string, error) {
+func SnapshotIDToProjectKey(id string) (string, string, error) {
 	splitId := strings.Split(id, "/")
 	if len(splitId) != snapshotTotalElements {
-		return "", fmt.Errorf("failed to get id components. Expected projects/{project}/global/snapshot/{name}. Got: %s", id)
+		return "", "", fmt.Errorf("failed to get id components. Expected projects/{project}/global/snapshot/{name}. Got: %s", id)
 	}
 	if splitId[snapshotTopologyKey] == "global" {
-		return splitId[snapshotTotalElements-1], nil
+		return splitId[snapshotProjectKey], splitId[snapshotTotalElements-1], nil
 	} else {
-		return "", fmt.Errorf("could not get id components, expected global, got: %v", splitId[snapshotTopologyKey])
+		return "", "", fmt.Errorf("could not get id components, expected global, got: %v", splitId[snapshotTopologyKey])
 	}
 }