Skip to content

Commit 86413b3

Browse files
mauriciopoppemauriciopoppe
committed
WIP prepare for bump to csi-proxy v1
1 parent 9da120b commit 86413b3

File tree

25 files changed

+196
-2800
lines changed

25 files changed

+196
-2800
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ spec:
7878
type: ""
7979
- name: csi-proxy-filesystem-v1
8080
hostPath:
81-
path: \\.\pipe\csi-proxy-filesystem-v1beta1
81+
path: \\.\pipe\csi-proxy-filesystem-v1
8282
type: ""
8383
- name: csi-proxy-disk-v1beta2
8484
hostPath:

Diff for: ‎deploy/kubernetes/overlays/noauth/controller_always_pull.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
kind: Deployment
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-controller
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: gce-pd-driver
10+
imagePullPolicy: Always

Diff for: ‎deploy/kubernetes/overlays/noauth/kustomization.yaml

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3+
patchesStrategicMerge:
4+
- controller_always_pull.yaml
5+
- node_always_pull.yaml
6+
- noauth.yaml
7+
namespace: gce-pd-csi-driver
38
resources:
49
- ../../base/
5-
# Here noauth overlay is using the same image as alpha
610
transformers:
711
- ../../images/alpha
8-
patchesStrategicMerge:
9-
- noauth.yaml
10-
namespace: gce-pd-csi-driver
12+
# devs: change this to your desired repo & tag
1113
images:
1214
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
1315
newName: gcr.io/mauriciopoppe-gke-dev/gcp-compute-persistent-disk-csi-driver
14-
newTag: f2e86e3a-363e-4536-87b4-636f7b9b4dec
16+
newTag: latest

Diff for: ‎deploy/kubernetes/overlays/noauth/node_always_pull.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
kind: DaemonSet
2+
apiVersion: apps/v1
3+
metadata:
4+
name: csi-gce-pd-node
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: gce-pd-driver
10+
imagePullPolicy: Always
11+
12+
---
13+
14+
kind: DaemonSet
15+
apiVersion: apps/v1
16+
metadata:
17+
name: csi-gce-pd-node-win
18+
spec:
19+
template:
20+
spec:
21+
containers:
22+
- name: gce-pd-driver
23+
imagePullPolicy: Always
24+

Diff for: ‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
github.com/hashicorp/go-multierror v1.0.0 // indirect
1212
github.com/kubernetes-csi/csi-proxy/client v0.2.2
1313
github.com/kubernetes-csi/csi-test/v3 v3.0.0
14-
github.com/mauriciopoppe/csi-proxy/client v0.2.3-0.20210406180041-795a5f3ac611
1514
github.com/onsi/ginkgo v1.11.0
1615
github.com/onsi/gomega v1.7.1
1716
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
@@ -78,3 +77,5 @@ replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
7877
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.0
7978

8079
replace k8s.io/sample-controller => k8s.io/sample-controller v0.18.0
80+
81+
replace github.com/kubernetes-csi/csi-proxy/client => ../../github.com/kubernetes-csi/csi-proxy/client

Diff for: ‎go.sum

+5-6
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5
6666
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
6767
github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
6868
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
69+
github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
70+
github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
6971
github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
7072
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
7173
github.com/OpenPeeDeeP/depguard v1.0.0/go.mod h1:7/4sitnI9YlQgTLLk734QlzXT8DuHVnAyztLplQjk+o=
@@ -464,8 +466,6 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
464466
github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
465467
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
466468
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
467-
github.com/kubernetes-csi/csi-proxy/client v0.2.2 h1:VpMddHnbYA1oBeU5nrisdyrpOAAT0HqME7fsTi6BG2w=
468-
github.com/kubernetes-csi/csi-proxy/client v0.2.2/go.mod h1:6ptQQmti5QHwBxSsh8Cy00oGdogj0JXewFnu8FFjgOs=
469469
github.com/kubernetes-csi/csi-test/v3 v3.0.0 h1:mVsfA4J67uNm8fdF/Pr84oMqL92qjIhjWbEUH8zv1fU=
470470
github.com/kubernetes-csi/csi-test/v3 v3.0.0/go.mod h1:VdIKGnDZHOjg4M5yd0OZICtsoEzdn64d0K33N6dm35Q=
471471
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
@@ -502,10 +502,6 @@ github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpe
502502
github.com/matttproud/golang_protobuf_extensions v1.0.0/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
503503
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
504504
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
505-
github.com/mauriciopoppe/csi-proxy/client v0.2.3-0.20210406055619-408505dd80b8 h1:VsqQNwGCxTHL+tWXciUzGcFHXme4JDE+3bjjZHZIP8c=
506-
github.com/mauriciopoppe/csi-proxy/client v0.2.3-0.20210406055619-408505dd80b8/go.mod h1:6ptQQmti5QHwBxSsh8Cy00oGdogj0JXewFnu8FFjgOs=
507-
github.com/mauriciopoppe/csi-proxy/client v0.2.3-0.20210406180041-795a5f3ac611 h1:OBq3iRxRNFxCHRGWV/HWjFHiheB5BRGt88dFC8j4HQM=
508-
github.com/mauriciopoppe/csi-proxy/client v0.2.3-0.20210406180041-795a5f3ac611/go.mod h1:MMA5K6yO30O4RWd0JA7Ersf7mfzJCoJJtu4Lrx3eNio=
509505
github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
510506
github.com/mholt/certmagic v0.6.2-0.20190624175158-6a42ef9fe8c2/go.mod h1:g4cOPxcjV0oFq3qwpjSA30LReKD8AoIfwAY9VvG35NY=
511507
github.com/miekg/dns v1.1.3/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -567,6 +563,8 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR
567563
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
568564
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
569565
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
566+
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
567+
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
570568
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
571569
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
572570
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
@@ -856,6 +854,7 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w
856854
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
857855
golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
858856
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
857+
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
859858
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
860859
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
861860
golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

Diff for: ‎pkg/mount-manager/safe-mounter_windows.go

+51-14
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ import (
2525
"strconv"
2626
"strings"
2727

28-
csiproxyclient "github.com/mauriciopoppe/csi-proxy/client"
29-
"github.com/mauriciopoppe/csi-proxy/client/apiversion"
28+
csiproxyclient "github.com/kubernetes-csi/csi-proxy/client"
29+
"github.com/kubernetes-csi/csi-proxy/client/apiversion"
3030

31-
diskapi "github.com/mauriciopoppe/csi-proxy/client/api/disk/v1"
32-
diskclient "github.com/mauriciopoppe/csi-proxy/client/groups/disk/v1"
31+
diskapi "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1"
32+
diskclient "github.com/kubernetes-csi/csi-proxy/client/groups/disk/v1"
3333

34-
fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1"
35-
fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1beta1"
34+
fsapi "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1"
35+
fsclient "github.com/kubernetes-csi/csi-proxy/client/groups/filesystem/v1"
3636

37-
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
38-
volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1beta1"
37+
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
38+
volumeclient "github.com/kubernetes-csi/csi-proxy/client/groups/volume/v1"
3939

4040
"k8s.io/klog"
4141
utilexec "k8s.io/utils/exec"
@@ -50,11 +50,12 @@ type CSIProxyMounter struct {
5050
VolumeClient *volumeclient.Client
5151
}
5252

53+
var versionv1beta2 = apiversion.NewVersionOrPanic("v1beta2")
54+
var versionv1beta1 = apiversion.NewVersionOrPanic("v1beta1")
55+
5356
func getDiskClient() (*diskclient.Client, error) {
5457
var err error
55-
version2 := apiversion.NewVersionOrPanic("v2")
56-
versionv1beta2 := apiversion.NewVersionOrPanic("v1beta2")
57-
diskAPIVersions := []apiversion.Version{version2, versionv1beta2}
58+
diskAPIVersions := []apiversion.Version{diskclient.Version, versionv1beta2}
5859

5960
// attempt to connect to one of the clients in order
6061
for _, apiVersion := range diskAPIVersions {
@@ -65,22 +66,58 @@ func getDiskClient() (*diskclient.Client, error) {
6566
klog.V(4).Infof("Connected to csi-proxy diskapi at path=%s", pipePath)
6667
return diskClient, nil
6768
}
68-
klog.V(4).Infof("Connection to csi-proxy diskapi at path=%s failed with error %v, might retry with a different version", pipePath, err)
69+
klog.V(4).Infof("Connection to csi-proxy diskapi at path=%s failed with error=%v, might retry with a different version", pipePath, err)
6970
}
7071
return nil, fmt.Errorf("Couldn't connect to any csi-proxy diskapi server, last error %v", err)
7172
}
7273

74+
func getFsClient() (*fsclient.Client, error) {
75+
var err error
76+
diskAPIVersions := []apiversion.Version{fsclient.Version, versionv1beta1}
77+
78+
// attempt to connect to one of the clients in order
79+
for _, apiVersion := range diskAPIVersions {
80+
pipePath := csiproxyclient.PipePath(fsclient.GroupName, apiVersion)
81+
klog.V(4).Infof("Attempting to connect to csi-proxy fsapi at path=%s", pipePath)
82+
fsClient, err := fsclient.NewClientWithPipePath(pipePath)
83+
if err == nil {
84+
klog.V(4).Infof("Connected to csi-proxy fsapi at path=%s", pipePath)
85+
return fsClient, nil
86+
}
87+
klog.V(4).Infof("Connection to csi-proxy fsapi at path=%s failed with error=%v, might retry with a different version", pipePath, err)
88+
}
89+
return nil, fmt.Errorf("Couldn't connect to any csi-proxy fsapi server, last error %v", err)
90+
}
91+
92+
func getVolumeClient() (*volumeclient.Client, error) {
93+
var err error
94+
diskAPIVersions := []apiversion.Version{volumeclient.Version, versionv1beta1}
95+
96+
// attempt to connect to one of the clients in order
97+
for _, apiVersion := range diskAPIVersions {
98+
pipePath := csiproxyclient.PipePath(volumeclient.GroupName, apiVersion)
99+
klog.V(4).Infof("Attempting to connect to csi-proxy volumeapi at path=%s", pipePath)
100+
volumeClient, err := volumeclient.NewClientWithPipePath(pipePath)
101+
if err == nil {
102+
klog.V(4).Infof("Connected to csi-proxy volumeapi at path=%s", pipePath)
103+
return volumeClient, nil
104+
}
105+
klog.V(4).Infof("Connection to csi-proxy volumeapi at path=%s failed with error=%v, might retry with a different version", pipePath, err)
106+
}
107+
return nil, fmt.Errorf("Couldn't connect to any csi-proxy volumeapi server, last error %v", err)
108+
}
109+
73110
func NewCSIProxyMounter() (*CSIProxyMounter, error) {
74111
diskClient, err := getDiskClient()
75112
if err != nil {
76113
return nil, err
77114
}
78115

79-
fsClient, err := fsclient.NewClient()
116+
fsClient, err := getFsClient()
80117
if err != nil {
81118
return nil, err
82119
}
83-
volumeClient, err := volumeclient.NewClient()
120+
volumeClient, err := getVolumeClient()
84121
if err != nil {
85122
return nil, err
86123
}

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

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

22-
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
22+
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
2323
"k8s.io/utils/mount"
2424
)
2525

Diff for: ‎pkg/resizefs/resizefs_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"context"
2323
"fmt"
2424

25-
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
25+
volumeapi "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
2626
"k8s.io/klog"
2727
"k8s.io/utils/mount"
2828
mounter "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/mount-manager"

Diff for: ‎vendor/github.com/Microsoft/go-winio/go.mod

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/Microsoft/go-winio/go.sum

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/Microsoft/go-winio/pipe.go

+14-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)