bump from v1beta3 APIs to v1

kubernetes-sigs · Jun 17, 2021 · 35e0f2e · 35e0f2e
1 parent 6b2ce4c
commit 35e0f2e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 30 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-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
+            - 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
             # 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-v1beta3
+      - name: csi-proxy-disk-v1
         hostPath:
-          path: \\.\pipe\csi-proxy-disk-v1beta3
+          path: \\.\pipe\csi-proxy-disk-v1
           type: ""
-      - name: csi-proxy-volume-v1beta3
+      - name: csi-proxy-volume-v1
         hostPath:
-          path: \\.\pipe\csi-proxy-volume-v1beta3
+          path: \\.\pipe\csi-proxy-volume-v1
           type: ""
-      - name: csi-proxy-filesystem-v1beta2
+      - name: csi-proxy-filesystem-v1
         hostPath:
-          path: \\.\pipe\csi-proxy-filesystem-v1beta2
+          path: \\.\pipe\csi-proxy-filesystem-v1
           type: ""
       # these paths are still included for compatibility, they're used
       # only if the node has still the beta version of the CSI proxy

diff --git a/deploy/kubernetes/base/node_windows/psp.yaml b/deploy/kubernetes/base/node_windows/psp.yaml
@@ -18,9 +18,9 @@ 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-v1beta3
-  - pathPrefix: \\.\pipe\csi-proxy-volume-v1beta3
-  - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1beta2
+  - pathPrefix: \\.\pipe\csi-proxy-disk-v1
+  - pathPrefix: \\.\pipe\csi-proxy-volume-v1
+  - pathPrefix: \\.\pipe\csi-proxy-filesystem-v1
   # 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

diff --git a/deploy/kubernetes/overlays/noauth-debug/kustomization.yaml b/deploy/kubernetes/overlays/noauth-debug/kustomization.yaml
@@ -10,7 +10,7 @@ patchesStrategicMerge:
 - controller-overlay.yaml
 namespace: gce-pd-csi-driver
 # To change the dev image, add something like the following.
-# images:
-# - name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
-#   newName: gcr.io/mauriciopoppe-gke-dev/gcp-compute-persistent-disk-csi-driver
-#   newTag: latest
+images:
+- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
+  newName: gcr.io/mauriciopoppe-gke-dev/gcp-compute-persistent-disk-csi-driver
+  newTag: latest
diff --git a/pkg/mount-manager/safe-mounter-v1_windows.go b/pkg/mount-manager/safe-mounter-v1_windows.go
@@ -24,17 +24,14 @@ import (
 	"path/filepath"
 	"strings"
 
-	// TODO(mauriciopoppe): these packages will become v1 if there are no more changes in the v1beta3 API,
-	// that's why this file it's called v1_windows.go even though it's still using v1beta3/v1beta2 APIs
+	diskapi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
+	diskclient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
 
-	diskapi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
-	diskclient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3"
+	fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1"
+	fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1"
 
-	fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2"
-	fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta2"
-
-	volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3"
-	volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta3"
+	volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
+	volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1"
 
 	"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,9 +19,8 @@ import (
 	"context"
 	"fmt"
 
+	volumeapiv1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
 	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"
 )