Merge pull request #609 from jingxu97/sep/beta

Update driver to use csi proxy filesystem v1beta1

Author: k8s-ci-robot

deploy/gcp-compute-persistent-disk-csi-driver-custom-role.yaml

@@ -5,3 +5,4 @@ includedPermissions:
 - compute.instances.get
 - compute.instances.attachDisk
 - compute.instances.detachDisk
+- compute.disks.get

deploy/kubernetes/base/node_windows/node.yaml

@@ -19,7 +19,7 @@ spec:
       # when deploying on GKE Windows node.
       # hostNetwork: true
       priorityClassName: csi-gce-pd-node
-      serviceAccountName: csi-gce-pd-node-sa
+      serviceAccountName: csi-gce-pd-node-sa-win
       nodeSelector:
         kubernetes.io/os: windows
       containers:
@@ -57,7 +57,7 @@ spec:
             - name: csi-proxy-volume-pipe
               mountPath: \\.\pipe\csi-proxy-volume-v1beta1
             - name: csi-proxy-filesystem-pipe
-              mountPath: \\.\pipe\csi-proxy-filesystem-v1alpha1
+              mountPath: \\.\pipe\csi-proxy-filesystem-v1beta1
       volumes:
       - name: csi-proxy-disk-pipe
         hostPath:
@@ -69,7 +69,7 @@ spec:
           type: ""
       - name: csi-proxy-filesystem-pipe
         hostPath:
-          path: \\.\pipe\csi-proxy-filesystem-v1alpha1
+          path: \\.\pipe\csi-proxy-filesystem-v1beta1
           type: ""
       - name: registration-dir
         hostPath:

deploy/kubernetes/base/node_windows/psp.yaml

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

deploy/kubernetes/images/alpha/image.yaml

@@ -4,8 +4,8 @@ metadata:
   name: imagetag-gcepd-driver-alpha-win
 imageTag:
   name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver-win
-  newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver-amd64-windows-1909
-  newTag: "cca3c14"
+  newName: gcr.io/gke-release-staging/gcp-compute-persistent-disk-csi-driver
+  newTag: "v1.0.1-gke.9"
 ---
 
 apiVersion: builtin

go.mod

@@ -9,7 +9,7 @@ require (
 	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.2.0
+	github.com/kubernetes-csi/csi-proxy/client v0.2.1
 	github.com/kubernetes-csi/csi-test/v3 v3.0.0
 	github.com/onsi/ginkgo v1.11.0
 	github.com/onsi/gomega v1.7.1

go.sum

@@ -420,6 +420,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kubernetes-csi/csi-proxy/client v0.2.0 h1:O801ogdqIJXhwABFfe9JRtz3N6hI0HxYdcDDnZzYQCk=
 github.com/kubernetes-csi/csi-proxy/client v0.2.0/go.mod h1:6ptQQmti5QHwBxSsh8Cy00oGdogj0JXewFnu8FFjgOs=
+github.com/kubernetes-csi/csi-proxy/client v0.2.1 h1:n21d2U9HvgQ6jfJayafRv8kXXtLvnRNEqoD0mQNucKc=
+github.com/kubernetes-csi/csi-proxy/client v0.2.1/go.mod h1:6ptQQmti5QHwBxSsh8Cy00oGdogj0JXewFnu8FFjgOs=
 github.com/kubernetes-csi/csi-test/v3 v3.0.0 h1:mVsfA4J67uNm8fdF/Pr84oMqL92qjIhjWbEUH8zv1fU=
 github.com/kubernetes-csi/csi-test/v3 v3.0.0/go.mod h1:VdIKGnDZHOjg4M5yd0OZICtsoEzdn64d0K33N6dm35Q=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=

pkg/mount-manager/safe-mounter_windows.go

@@ -27,8 +27,8 @@ import (
 	diskapi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1"
 	diskclient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1"
 
-	fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1"
-	fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1"
+	fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1"
+	fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1"
 
 	volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
 	volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1"

vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1/api.pb.go renamed to vendor/github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1/api.pb.go

@@ -56,14 +56,14 @@ github.com/imdario/mergo
 github.com/json-iterator/go
 # github.com/konsorten/go-windows-terminal-sequences v1.0.2
 github.com/konsorten/go-windows-terminal-sequences
-# github.com/kubernetes-csi/csi-proxy/client v0.2.0
+# github.com/kubernetes-csi/csi-proxy/client v0.2.1
 github.com/kubernetes-csi/csi-proxy/client
 github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1
-github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1
+github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/apiversion
 github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta1
-github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1alpha1
+github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1
 github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1
 # github.com/kubernetes-csi/csi-test/v3 v3.0.0
 github.com/kubernetes-csi/csi-test/v3/pkg/sanity