Skip to content

Commit 35e0f2e

Browse files
committed
bump from v1beta3 APIs to v1
1 parent 6b2ce4c commit 35e0f2e

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ spec:
5353
mountPropagation: "None"
5454
- name: plugin-dir
5555
mountPath: C:\csi
56-
- name: csi-proxy-volume-v1beta3
57-
mountPath: \\.\pipe\csi-proxy-volume-v1beta3
58-
- name: csi-proxy-filesystem-v1beta2
59-
mountPath: \\.\pipe\csi-proxy-filesystem-v1beta2
60-
- name: csi-proxy-disk-v1beta3
61-
mountPath: \\.\pipe\csi-proxy-disk-v1beta3
56+
- name: csi-proxy-volume-v1
57+
mountPath: \\.\pipe\csi-proxy-volume-v1
58+
- name: csi-proxy-filesystem-v1
59+
mountPath: \\.\pipe\csi-proxy-filesystem-v1
60+
- name: csi-proxy-disk-v1
61+
mountPath: \\.\pipe\csi-proxy-disk-v1
6262
# these paths are still included for compatibility, they're used
6363
# only if the node has still the beta version of the CSI proxy
6464
- name: csi-proxy-volume-v1beta1
@@ -68,17 +68,17 @@ spec:
6868
- name: csi-proxy-disk-v1beta2
6969
mountPath: \\.\pipe\csi-proxy-disk-v1beta2
7070
volumes:
71-
- name: csi-proxy-disk-v1beta3
71+
- name: csi-proxy-disk-v1
7272
hostPath:
73-
path: \\.\pipe\csi-proxy-disk-v1beta3
73+
path: \\.\pipe\csi-proxy-disk-v1
7474
type: ""
75-
- name: csi-proxy-volume-v1beta3
75+
- name: csi-proxy-volume-v1
7676
hostPath:
77-
path: \\.\pipe\csi-proxy-volume-v1beta3
77+
path: \\.\pipe\csi-proxy-volume-v1
7878
type: ""
79-
- name: csi-proxy-filesystem-v1beta2
79+
- name: csi-proxy-filesystem-v1
8080
hostPath:
81-
path: \\.\pipe\csi-proxy-filesystem-v1beta2
81+
path: \\.\pipe\csi-proxy-filesystem-v1
8282
type: ""
8383
# these paths are still included for compatibility, they're used
8484
# only if the node has still the beta version of the CSI proxy

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ spec:
1818
- pathPrefix: \var\lib\kubelet
1919
- pathPrefix: \var\lib\kubelet\plugins_registry
2020
- pathPrefix: \var\lib\kubelet\plugins\pd.csi.storage.gke.io
21-
- pathPrefix: \\.\pipe\csi-proxy-disk-v1beta3
22-
- pathPrefix: \\.\pipe\csi-proxy-volume-v1beta3
23-
- pathPrefix: \\.\pipe\csi-proxy-filesystem-v1beta2
21+
- pathPrefix: \\.\pipe\csi-proxy-disk-v1
22+
- pathPrefix: \\.\pipe\csi-proxy-volume-v1
23+
- pathPrefix: \\.\pipe\csi-proxy-filesystem-v1
2424
# these paths are allowed only for compatibility mode if the PD CSI driver
2525
# is using the CSI Proxy v1 client and the node is still using the
2626
# beta version of the CSI proxy

Diff for: deploy/kubernetes/overlays/noauth-debug/kustomization.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ patchesStrategicMerge:
1010
- controller-overlay.yaml
1111
namespace: gce-pd-csi-driver
1212
# To change the dev image, add something like the following.
13-
# images:
14-
# - name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
15-
# newName: gcr.io/mauriciopoppe-gke-dev/gcp-compute-persistent-disk-csi-driver
16-
# newTag: latest
13+
images:
14+
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
15+
newName: gcr.io/mauriciopoppe-gke-dev/gcp-compute-persistent-disk-csi-driver
16+
newTag: latest

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

+6-9
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,14 @@ import (
2424
"path/filepath"
2525
"strings"
2626

27-
// TODO(mauriciopoppe): these packages will become v1 if there are no more changes in the v1beta3 API,
28-
// that's why this file it's called v1_windows.go even though it's still using v1beta3/v1beta2 APIs
27+
diskapi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
28+
diskclient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
2929

30-
diskapi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3"
31-
diskclient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1beta3"
30+
fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1"
31+
fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1"
3232

33-
fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2"
34-
fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta2"
35-
36-
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3"
37-
volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta3"
33+
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
34+
volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1"
3835

3936
"k8s.io/klog"
4037
mount "k8s.io/mount-utils"

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ import (
1919
"context"
2020
"fmt"
2121

22+
volumeapiv1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
2223
volumeapiv1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
23-
// TODO(mauriciopoppe): use v1 when it's released, the import is aliased to volumeapiv1 for a smaller diff later
24-
volumeapiv1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3"
2524
"k8s.io/mount-utils"
2625
)
2726

0 commit comments

Comments
 (0)