Keep using v1beta1 for the volume API

kubernetes-sigs · Jun 11, 2021 · d623c9f · d623c9f
1 parent 666f2b9
commit d623c9f
Show file tree

Hide file tree

Showing 18 changed files with 141 additions and 2,195 deletions.
diff --git a/deploy/kubernetes/base/node_windows/node.yaml b/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,17 +68,17 @@ 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: ""
       - name: csi-proxy-disk-v1beta2
         hostPath:

diff --git a/pkg/mount-manager/safe-mounter-v1beta_windows.go b/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 --git a/pkg/mount-manager/statter_windows.go b/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"
@@ -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 --git a/pkg/resizefs/resizefs_windows.go b/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)