Update to use csi proxy beta

This PR updates driver to use csi-proxy beta version.

Author: jingxu97

deploy/kubernetes/base/node_windows/node.yaml

@@ -43,6 +43,7 @@ spec:
           # Don't change base image without changing pdImagePlaceholder in
           # test/k8s-integration/main.go
           image: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win
+          imagePullPolicy: Always
           args:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
@@ -53,19 +54,19 @@ spec:
             - name: plugin-dir
               mountPath: C:\csi
             - name: csi-proxy-disk-pipe
-              mountPath: \\.\pipe\csi-proxy-disk-v1alpha1
+              mountPath: \\.\pipe\csi-proxy-disk-v1beta1
             - name: csi-proxy-volume-pipe
-              mountPath: \\.\pipe\csi-proxy-volume-v1alpha1
+              mountPath: \\.\pipe\csi-proxy-volume-v1beta1
             - name: csi-proxy-filesystem-pipe
               mountPath: \\.\pipe\csi-proxy-filesystem-v1alpha1
       volumes:
       - name: csi-proxy-disk-pipe
         hostPath:
-          path: \\.\pipe\csi-proxy-disk-v1alpha1
+          path: \\.\pipe\csi-proxy-disk-v1beta1
           type: ""
       - name: csi-proxy-volume-pipe
         hostPath:
-          path: \\.\pipe\csi-proxy-volume-v1alpha1
+          path: \\.\pipe\csi-proxy-volume-v1beta1
           type: ""
       - name: csi-proxy-filesystem-pipe
         hostPath:

deploy/kubernetes/base/node_windows/psp.yaml

@@ -18,7 +18,7 @@ spec:
   - pathPrefix: \var\lib\kubelet
   - pathPrefix: \var\lib\kubelet\plugins_registry
   - pathPrefix: \var\lib\kubelet\plugins\pd.csi.storage.gke.io
-  - pathPrefix: \\.\pipe\csi-proxy-disk-v1alpha1
-  - pathPrefix: \\.\pipe\csi-proxy-volume-v1alpha1
+  - pathPrefix: \\.\pipe\csi-proxy-disk-v1beta1
+  - pathPrefix: \\.\pipe\csi-proxy-volume-v1beta1
   - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1alpha1
 

go.mod

@@ -6,18 +6,17 @@ require (
 	cloud.google.com/go v0.45.1
 	github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190822182118-27a4ced34534
 	github.com/container-storage-interface/spec v1.2.0
-	github.com/golang/protobuf v1.3.4
+	github.com/golang/protobuf v1.4.1
 	github.com/google/uuid v1.1.1
 	github.com/hashicorp/go-multierror v1.0.0 // indirect
-	github.com/kubernetes-csi/csi-proxy/client v0.0.0-20200330215040-9eff16441b2a
+	github.com/kubernetes-csi/csi-proxy/client v0.2.0
 	github.com/kubernetes-csi/csi-test/v3 v3.0.0
 	github.com/onsi/ginkgo v1.11.0
 	github.com/onsi/gomega v1.7.1
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056
-	golang.org/x/tools/gopls v0.3.3 // indirect
 	google.golang.org/api v0.10.0
-	google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
 	google.golang.org/grpc v1.27.1
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/warnings.v0 v0.1.2 // indirect

go.sum

@@ -22,16 +22,18 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
-	diskv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1"
-	diskclientv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1alpha1"
+	diskv1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
+	diskclientv1beta1 "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1"
 
 	fsv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1"
 	fsclientv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1"
 
-	volumev1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1alpha1"
-	volumeclientv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1alpha1"
+	volumev1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
+	volumeclientv1beta1 "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1"
 
+	"k8s.io/klog"
 	utilexec "k8s.io/utils/exec"
 	"k8s.io/utils/mount"
 )
@@ -40,20 +42,20 @@ var _ mount.Interface = &CSIProxyMounter{}
 
 type CSIProxyMounter struct {
 	FsClient     *fsclientv1alpha1.Client
-	DiskClient   *diskclientv1alpha1.Client
-	VolumeClient *volumeclientv1alpha1.Client
+	DiskClient   *diskclientv1beta1.Client
+	VolumeClient *volumeclientv1beta1.Client
 }
 
 func NewCSIProxyMounter() (*CSIProxyMounter, error) {
 	fsClient, err := fsclientv1alpha1.NewClient()
 	if err != nil {
 		return nil, err
 	}
-	diskClient, err := diskclientv1alpha1.NewClient()
+	diskClient, err := diskclientv1beta1.NewClient()
 	if err != nil {
 		return nil, err
 	}
-	volumeClient, err := volumeclientv1alpha1.NewClient()
+	volumeClient, err := volumeclientv1beta1.NewClient()
 	if err != nil {
 		return nil, err
 	}
@@ -142,30 +144,37 @@ func (mounter *CSIProxyMounter) Unmount(target string) error {
 }
 
 func (mounter *CSIProxyMounter) GetDevicePath(deviceName string, partition string, volumeKey string) (string, error) {
-	getDiskNumberRequest := &diskv1alpha1.GetDiskNumberByNameRequest{
-		DiskName: deviceName,
-	}
-	getDiskNumberResponse, err := mounter.DiskClient.GetDiskNumberByName(context.Background(), getDiskNumberRequest)
+	id := "page83"
+	listRequest := &diskv1beta1.ListDiskIDsRequest{}
+	diskIDsResponse, err := mounter.DiskClient.ListDiskIDs(context.Background(), listRequest)
 	if err != nil {
 		return "", err
 	}
-	return getDiskNumberResponse.DiskNumber, nil
+	diskIDsMap := diskIDsResponse.GetDiskIDs()
+	for diskNum, diskInfo := range diskIDsMap {
+		klog.V(4).Infof("found disknum %s, diskInfo %v", diskNum, diskInfo)
+		idValue, found := diskInfo.Identifiers[id]
+		if found && strings.Contains(idValue, deviceName) {
+			return diskNum, nil
+		}
+	}
+	return "", fmt.Errorf("could not find disk number for device %s", deviceName)
 
 }
 
 // FormatAndMount accepts the source disk number, target path to mount, the fstype to format with and options to be used.
 // After formatting, it will mount the disk to target path on the host
 func (mounter *CSIProxyMounter) FormatAndMount(source string, target string, fstype string, options []string) error {
 	// Call PartitionDisk CSI proxy call to partition the disk and return the volume id
-	partionDiskRequest := &diskv1alpha1.PartitionDiskRequest{
+	partionDiskRequest := &diskv1beta1.PartitionDiskRequest{
 		DiskID: source,
 	}
 
 	_, err := mounter.DiskClient.PartitionDisk(context.Background(), partionDiskRequest)
 	if err != nil {
 		return err
 	}
-	volumeIDsRequest := &volumev1alpha1.ListVolumesOnDiskRequest{
+	volumeIDsRequest := &volumev1beta1.ListVolumesOnDiskRequest{
 		DiskId: source,
 	}
 	volumeIdResponse, err := mounter.VolumeClient.ListVolumesOnDisk(context.Background(), volumeIDsRequest)
@@ -174,15 +183,15 @@ func (mounter *CSIProxyMounter) FormatAndMount(source string, target string, fst
 	}
 	// TODO: consider partitions and choose the right partition.
 	volumeID := volumeIdResponse.VolumeIds[0]
-	isVolumeFormattedRequest := &volumev1alpha1.IsVolumeFormattedRequest{
+	isVolumeFormattedRequest := &volumev1beta1.IsVolumeFormattedRequest{
 		VolumeId: volumeID,
 	}
 	isVolumeFormattedResponse, err := mounter.VolumeClient.IsVolumeFormatted(context.Background(), isVolumeFormattedRequest)
 	if err != nil {
 		return err
 	}
 	if !isVolumeFormattedResponse.Formatted {
-		formatVolumeRequest := &volumev1alpha1.FormatVolumeRequest{
+		formatVolumeRequest := &volumev1beta1.FormatVolumeRequest{
 			VolumeId: volumeID,
 			// TODO (jingxu97): Accept the filesystem and other options
 		}
@@ -192,7 +201,7 @@ func (mounter *CSIProxyMounter) FormatAndMount(source string, target string, fst
 		}
 	}
 	// Mount the volume by calling the CSI proxy call.
-	mountVolumeRequest := &volumev1alpha1.MountVolumeRequest{
+	mountVolumeRequest := &volumev1beta1.MountVolumeRequest{
 		VolumeId: volumeID,
 		Path:     target,
 	}