Keep using v1beta1 for the volume API

Author: mauriciopoppe

Diff for: deploy/kubernetes/base/node_windows/node.yaml

@@ -53,12 +53,12 @@ spec:
               mountPropagation: "None"
             - name: plugin-dir
               mountPath: C:\csi
-            - name: csi-proxy-volume-v1
-              mountPath: \\.\pipe\csi-proxy-volume-v1
-            - name: csi-proxy-filesystem-v1
-              mountPath: \\.\pipe\csi-proxy-filesystem-v1
-            - name: csi-proxy-disk-v1
-              mountPath: \\.\pipe\csi-proxy-disk-v1
+            - name: csi-proxy-volume-v1beta3
+              mountPath: \\.\pipe\csi-proxy-volume-v1beta3
+            - name: csi-proxy-filesystem-v1beta2
+              mountPath: \\.\pipe\csi-proxy-filesystem-v1beta2
+            - name: csi-proxy-disk-v1beta3
+              mountPath: \\.\pipe\csi-proxy-disk-v1beta3
             # these paths are still included for compatibility, they're used
             # only if the node has still the beta version of the CSI proxy
             - name: csi-proxy-volume-v1beta1
@@ -68,18 +68,20 @@ spec:
             - name: csi-proxy-disk-v1beta2
               mountPath: \\.\pipe\csi-proxy-disk-v1beta2
       volumes:
-      - name: csi-proxy-disk-v1
+      - name: csi-proxy-disk-v1beta3
         hostPath:
-          path: \\.\pipe\csi-proxy-disk-v1
+          path: \\.\pipe\csi-proxy-disk-v1beta3
           type: ""
-      - name: csi-proxy-volume-v1
+      - name: csi-proxy-volume-v1beta3
         hostPath:
-          path: \\.\pipe\csi-proxy-volume-v1
+          path: \\.\pipe\csi-proxy-volume-v1beta3
           type: ""
-      - name: csi-proxy-filesystem-v1
+      - name: csi-proxy-filesystem-v1beta2
         hostPath:
-          path: \\.\pipe\csi-proxy-filesystem-v1
+          path: \\.\pipe\csi-proxy-filesystem-v1beta2
           type: ""
+      # these paths are still included for compatibility, they're used
+      # only if the node has still the beta version of the CSI proxy
       - name: csi-proxy-disk-v1beta2
         hostPath:
           path: \\.\pipe\csi-proxy-disk-v1beta2

Diff for: deploy/kubernetes/base/node_windows/psp.yaml

@@ -18,13 +18,13 @@ 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-v1
-  - pathPrefix: \\.\pipe\csi-proxy-volume-v1
-  - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1
+  - pathPrefix: \\.\pipe\csi-proxy-disk-v1beta3
+  - pathPrefix: \\.\pipe\csi-proxy-volume-v1beta3
+  - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1beta2
   # these paths are allowed only for compatibility mode if the PD CSI driver
   # is using the CSI Proxy v1 client and the node is still using the
   # beta version of the CSI proxy
-  - pathPrefix: \\.\pipe\csi-proxy-disk-v1beta1
+  - pathPrefix: \\.\pipe\csi-proxy-disk-v1beta2
   - pathPrefix: \\.\pipe\csi-proxy-volume-v1beta1
   - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1beta1
 

Diff for: pkg/mount-manager/safe-mounter-v1beta_windows.go

@@ -31,8 +31,8 @@ import (
 	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/v1beta2"
-	volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta2"
+	volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
+	volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1"
 
 	"k8s.io/klog"
 	mount "k8s.io/mount-utils"

Diff for: pkg/mount-manager/statter_windows.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"fmt"
 
-	volumeapiv1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2"
+	volumeapiv1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
 	// TODO(mauriciopoppe): use v1 when it's released, the import is aliased to volumeapiv1 for a smaller diff later
 	volumeapiv1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3"
 	"k8s.io/mount-utils"
@@ -49,7 +49,7 @@ func (r *realStatter) StatFS(path string) (available, capacity, used, inodesFree
 		return r.StatFSV1Beta(path)
 	}
 
-	return 1, 1, 1, 1, 1, 1, fmt.Errorf("Invalid interface type=%v", r.mounter.Interface)
+	return 0, 0, 0, 0, 0, 0, fmt.Errorf("Invalid interface type=%v", r.mounter.Interface)
 }
 
 func (r *realStatter) StatFSV1(path string) (available, capacity, used, inodesFree, inodes, inodesUsed int64, err error) {
@@ -83,7 +83,7 @@ func (r *realStatter) StatFSV1Beta(path string) (available, capacity, used, inod
 
 	proxy := r.mounter.Interface.(*CSIProxyMounterV1Beta)
 
-	idRequest := &volumeapiv1beta2.VolumeIDFromMountRequest{
+	idRequest := &volumeapiv1beta1.VolumeIDFromMountRequest{
 		Mount: path,
 	}
 	idResponse, err := proxy.VolumeClient.GetVolumeIDFromMount(context.Background(), idRequest)
@@ -92,7 +92,7 @@ func (r *realStatter) StatFSV1Beta(path string) (available, capacity, used, inod
 	}
 	volumeID := idResponse.GetVolumeId()
 
-	request := &volumeapiv1beta2.VolumeStatsRequest{
+	request := &volumeapiv1beta1.VolumeStatsRequest{
 		VolumeId: volumeID,
 	}
 	response, err := proxy.VolumeClient.VolumeStats(context.Background(), request)

Diff for: pkg/resizefs/resizefs_windows.go

@@ -22,7 +22,7 @@ import (
 	"context"
 	"fmt"
 
-	volumeapiv1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2"
+	volumeapiv1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
 	// TODO(mauriciopoppe): use v1 when it's released, the import is aliased to volumeapiv1 for a smaller diff later
 	volumeapiv1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3"
 
@@ -84,7 +84,7 @@ func (resizefs *resizeFs) resizeV1Beta(devicePath string, deviceMountPath string
 
 	proxy := resizefs.mounter.Interface.(*mounter.CSIProxyMounterV1Beta)
 
-	idRequest := &volumeapiv1beta2.VolumeIDFromMountRequest{
+	idRequest := &volumeapiv1beta1.VolumeIDFromMountRequest{
 		Mount: deviceMountPath,
 	}
 	idResponse, err := proxy.VolumeClient.GetVolumeIDFromMount(context.Background(), idRequest)
@@ -93,7 +93,7 @@ func (resizefs *resizeFs) resizeV1Beta(devicePath string, deviceMountPath string
 	}
 	volumeId := idResponse.GetVolumeId()
 
-	request := &volumeapiv1beta2.ResizeVolumeRequest{
+	request := &volumeapiv1beta1.ResizeVolumeRequest{
 		VolumeId: volumeId,
 	}
 	_, err = proxy.VolumeClient.ResizeVolume(context.Background(), request)