Skip to content

Commit 512cdd3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1814 from travisyx/upgrade-csi
Upgrade sanity tests to v5.3.0 and CSI Spec to v1.10.0
2 parents 450be4d + 0ffda01 commit 512cdd3

File tree

172 files changed

+10150
-17134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+10150
-17134
lines changed

‎go.mod

+6-8
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ require (
99
cloud.google.com/go/kms v1.17.1
1010
cloud.google.com/go/resourcemanager v1.9.7
1111
github.com/GoogleCloudPlatform/k8s-cloud-provider v1.24.0
12-
github.com/container-storage-interface/spec v1.6.0
12+
github.com/container-storage-interface/spec v1.10.0
1313
github.com/google/go-cmp v0.6.0
1414
github.com/google/uuid v1.6.0
1515
github.com/googleapis/gax-go/v2 v2.12.4
1616
github.com/kubernetes-csi/csi-proxy/client v1.1.3
17-
github.com/kubernetes-csi/csi-test/v4 v4.4.0
17+
github.com/kubernetes-csi/csi-test/v5 v5.3.0
1818
github.com/onsi/ginkgo/v2 v2.20.1
1919
github.com/onsi/gomega v1.34.1
2020
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
@@ -27,15 +27,15 @@ require (
2727
golang.org/x/time v0.5.0
2828
google.golang.org/api v0.183.0
2929
google.golang.org/genproto v0.0.0-20240528184218-531527333157
30-
google.golang.org/grpc v1.64.0
30+
google.golang.org/grpc v1.65.0
3131
google.golang.org/protobuf v1.34.1
3232
gopkg.in/gcfg.v1 v1.2.3
3333
k8s.io/api v0.24.1
3434
k8s.io/apimachinery v0.24.1
3535
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
3636
k8s.io/cloud-provider v0.24.1
3737
k8s.io/component-base v0.24.1
38-
k8s.io/klog/v2 v2.120.1
38+
k8s.io/klog/v2 v2.130.1
3939
k8s.io/mount-utils v0.30.1
4040
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
4141
sigs.k8s.io/boskos v0.0.0-20220711194915-6cb8a6fb2dd1
@@ -53,7 +53,7 @@ require (
5353
github.com/beorn7/perks v1.0.1 // indirect
5454
github.com/blang/semver/v4 v4.0.0 // indirect
5555
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
56-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
56+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5757
github.com/davecgh/go-spew v1.1.1 // indirect
5858
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
5959
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -85,7 +85,6 @@ require (
8585
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8686
github.com/modern-go/reflect2 v1.0.2 // indirect
8787
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
88-
github.com/nxadm/tail v1.4.8 // indirect
8988
github.com/onsi/ginkgo v1.16.5 // indirect
9089
github.com/pkg/errors v0.9.1 // indirect
9190
github.com/prometheus/client_golang v1.12.1 // indirect
@@ -108,10 +107,9 @@ require (
108107
golang.org/x/term v0.23.0 // indirect
109108
golang.org/x/text v0.17.0 // indirect
110109
golang.org/x/tools v0.24.0 // indirect
111-
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e // indirect
110+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
112111
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
113112
gopkg.in/inf.v0 v0.9.1 // indirect
114-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
115113
gopkg.in/warnings.v0 v0.1.2 // indirect
116114
gopkg.in/yaml.v2 v2.4.0 // indirect
117115
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

+14-18
Original file line numberDiff line numberDiff line change
@@ -867,8 +867,9 @@ github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6
867867
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
868868
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
869869
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
870-
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
871870
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
871+
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
872+
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
872873
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
873874
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
874875
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -895,8 +896,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
895896
github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
896897
github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
897898
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
898-
github.com/container-storage-interface/spec v1.6.0 h1:vwN9uCciKygX/a0toYryoYD5+qI9ZFeAMuhEEKO+JBA=
899-
github.com/container-storage-interface/spec v1.6.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=
899+
github.com/container-storage-interface/spec v1.10.0 h1:YkzWPV39x+ZMTa6Ax2czJLLwpryrQ+dPesB34mrRMXA=
900+
github.com/container-storage-interface/spec v1.10.0/go.mod h1:DtUvaQszPml1YJfIK7c00mlv6/g4wNMLanLgiUbKFRI=
900901
github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko=
901902
github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw=
902903
github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -1278,8 +1279,8 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw
12781279
github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4=
12791280
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
12801281
github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
1281-
github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
1282-
github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
1282+
github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=
1283+
github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
12831284
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
12841285
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
12851286
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -1421,7 +1422,6 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
14211422
github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
14221423
github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
14231424
github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
1424-
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
14251425
github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
14261426
github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
14271427
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -1666,8 +1666,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
16661666
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
16671667
github.com/kubernetes-csi/csi-proxy/client v1.1.3 h1:FdGU7NtxGhQX2wTfnuscmThG920hq0OaVVpuJW9t2k0=
16681668
github.com/kubernetes-csi/csi-proxy/client v1.1.3/go.mod h1:SfK4HVKQdMH5KrffivddAWgX5hl3P5KmnuOTBbDNboU=
1669-
github.com/kubernetes-csi/csi-test/v4 v4.4.0 h1:r0mnAwDURI24Vw3a/LyA/ga11yD5ZGuU7+REO35Na9s=
1670-
github.com/kubernetes-csi/csi-test/v4 v4.4.0/go.mod h1:t1RzseMZJKy313nezI/d7TolbbiKpUZM3SXQvXxOX0w=
1669+
github.com/kubernetes-csi/csi-test/v5 v5.3.0 h1:IbF3om4KZxH1KHvy+KfqJ7ZrdjYNLntAVkQXYra+9iM=
1670+
github.com/kubernetes-csi/csi-test/v5 v5.3.0/go.mod h1:NKklMyStHq8o5I30YCXxS7+v/Z4LRoft553EXR6zMS8=
16711671
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
16721672
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
16731673
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -1820,7 +1820,6 @@ github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvw
18201820
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
18211821
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
18221822
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
1823-
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
18241823
github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo=
18251824
github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
18261825
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@@ -1836,8 +1835,6 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
18361835
github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
18371836
github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
18381837
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
1839-
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
1840-
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
18411838
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
18421839
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
18431840
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
@@ -2975,7 +2972,6 @@ google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6D
29752972
google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
29762973
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
29772974
google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
2978-
google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
29792975
google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
29802976
google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
29812977
google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -3081,8 +3077,8 @@ google.golang.org/genproto v0.0.0-20240528184218-531527333157 h1:u7WMYrIrVvs0TF5
30813077
google.golang.org/genproto v0.0.0-20240528184218-531527333157/go.mod h1:ubQlAQnzejB8uZzszhrTCU2Fyp6Vi7ZE5nn0c3W8+qQ=
30823078
google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8=
30833079
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
3084-
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e h1:SkdGTrROJl2jRGT/Fxv5QUf9jtdKCQh4KQJXbXVLAi0=
3085-
google.golang.org/genproto/googleapis/api v0.0.0-20240521202816-d264139d666e/go.mod h1:LweJcLbyVij6rCex8YunD8DYR5VDonap/jYl3ZRxcIU=
3080+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw=
3081+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
30863082
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc=
30873083
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
30883084
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8=
@@ -3139,8 +3135,8 @@ google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCD
31393135
google.golang.org/grpc v1.51.0/go.mod h1:wgNDFcnuBGmxLKI/qn4T+m5BtEBYXJPvibbUPsAIPww=
31403136
google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
31413137
google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
3142-
google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
3143-
google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
3138+
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
3139+
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
31443140
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
31453141
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
31463142
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -3334,8 +3330,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
33343330
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
33353331
k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
33363332
k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
3337-
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
3338-
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
3333+
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
3334+
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
33393335
k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
33403336
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
33413337
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=

‎pkg/gce-pd-csi-driver/controller.go

+8
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ type GCEControllerServer struct {
108108
multiZoneVolumeHandleConfig MultiZoneVolumeHandleConfig
109109

110110
listVolumesConfig ListVolumesConfig
111+
112+
// Embed UnimplementedControllerServer to ensure the driver returns Unimplemented for any
113+
// new RPC methods that might be introduced in future versions of the spec.
114+
csi.UnimplementedControllerServer
111115
}
112116

113117
type MultiZoneVolumeHandleConfig struct {
@@ -716,6 +720,10 @@ func (gceCS *GCEControllerServer) createSingleDisk(ctx context.Context, req *csi
716720
return disk, nil
717721
}
718722

723+
func (gceCS *GCEControllerServer) ControllerModifyVolume(ctx context.Context, req *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) {
724+
return nil, status.Error(codes.Unimplemented, "ControllerModifyVolume unsupported")
725+
}
726+
719727
func (gceCS *GCEControllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
720728
var err error
721729
// Validate arguments

‎pkg/gce-pd-csi-driver/controller_test.go

+40-2
Original file line numberDiff line numberDiff line change
@@ -1518,7 +1518,45 @@ func TestMultiZoneVolumeCreation(t *testing.T) {
15181518
sortTopologies := func(t1, t2 *csi.Topology) bool {
15191519
return t1.Segments[common.TopologyKeyZone] < t2.Segments[common.TopologyKeyZone]
15201520
}
1521-
if diff := cmp.Diff(expVol, vol, cmpopts.SortSlices(sortTopologies)); diff != "" {
1521+
1522+
// Custom comparers to compare two volumes
1523+
contentSourceComparer := cmp.Comparer(func(a, b *csi.VolumeContentSource) bool {
1524+
if a == nil {
1525+
return b == nil
1526+
}
1527+
if b == nil {
1528+
return false
1529+
}
1530+
if vcsA, ok := a.Type.(*csi.VolumeContentSource_Snapshot); ok {
1531+
if vcsB, valid := b.Type.(*csi.VolumeContentSource_Snapshot); valid {
1532+
return vcsA.Snapshot.SnapshotId == vcsB.Snapshot.SnapshotId
1533+
}
1534+
return false
1535+
}
1536+
if vcsA, ok := a.Type.(*csi.VolumeContentSource_Volume); ok {
1537+
if vcsB, valid := b.Type.(*csi.VolumeContentSource_Volume); valid {
1538+
return vcsA.Volume.VolumeId == vcsB.Volume.VolumeId
1539+
}
1540+
return false
1541+
}
1542+
return false
1543+
})
1544+
topComparer := cmp.Comparer(func(a, b *csi.Topology) bool {
1545+
return cmp.Diff(a.Segments, b.Segments) == ""
1546+
})
1547+
volComparer := cmp.Comparer(func(a, b *csi.Volume) bool {
1548+
if a == nil {
1549+
return b == nil
1550+
}
1551+
if b == nil {
1552+
return false
1553+
}
1554+
topEqual := cmp.Diff(a.AccessibleTopology, b.AccessibleTopology, cmpopts.SortSlices(sortTopologies), topComparer) == ""
1555+
vcEqual := cmp.Diff(a.VolumeContext, b.VolumeContext) == ""
1556+
csEqual := cmp.Diff(a.ContentSource, b.ContentSource, contentSourceComparer) == ""
1557+
return a.CapacityBytes == b.CapacityBytes && a.VolumeId == b.VolumeId && vcEqual && topEqual && csEqual
1558+
})
1559+
if diff := cmp.Diff(expVol, vol, volComparer); diff != "" {
15221560
t.Errorf("Accessible topologies mismatch (-want +got):\n%s", diff)
15231561
}
15241562

@@ -2124,7 +2162,7 @@ func TestListVolumeResponse(t *testing.T) {
21242162
}
21252163
}
21262164

2127-
func entryToVolumeId(e csi.ListVolumesResponse_Entry) string {
2165+
func entryToVolumeId(e *csi.ListVolumesResponse_Entry) string {
21282166
return e.Volume.VolumeId
21292167
}
21302168

‎pkg/gce-pd-csi-driver/identity.go

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ import (
2424

2525
type GCEIdentityServer struct {
2626
Driver *GCEDriver
27+
28+
// Embed UnimplementedIdentityServer to ensure the driver returns Unimplemented for any
29+
// new RPC methods that might be introduced in future versions of the spec.
30+
csi.UnimplementedIdentityServer
2731
}
2832

2933
// GetPluginInfo(context.Context, *GetPluginInfoRequest) (*GetPluginInfoResponse, error)

‎pkg/gce-pd-csi-driver/node.go

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ type GCENodeServer struct {
5959
// been observed).
6060
formatAndMountSemaphore chan any
6161
formatAndMountTimeout time.Duration
62+
63+
// Embed UnimplementedNodeServer to ensure the driver returns Unimplemented for any
64+
// new RPC methods that might be introduced in future versions of the spec.
65+
csi.UnimplementedNodeServer
6266
}
6367

6468
var _ csi.NodeServer = &GCENodeServer{}

‎pkg/gce-pd-csi-driver/node_test.go

+19-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,25 @@ func TestNodeGetVolumeStats(t *testing.T) {
187187
if err == nil && tc.expectErr {
188188
t.Fatal("Did not get error but expected one")
189189
}
190-
if diff := cmp.Diff(tc.expectedResp, resp); diff != "" {
190+
nodeComparer := cmp.Comparer(func(a, b *csi.NodeGetVolumeStatsResponse) bool {
191+
if a == nil {
192+
return b == nil
193+
}
194+
if b == nil {
195+
return false
196+
}
197+
volUsageComparer := cmp.Comparer(func(x, y *csi.VolumeUsage) bool {
198+
if x == nil {
199+
return y == nil
200+
}
201+
if y == nil {
202+
return false
203+
}
204+
return x.Unit == y.Unit && x.Total == y.Total
205+
})
206+
return cmp.Diff(a.Usage, b.Usage, volUsageComparer) == ""
207+
})
208+
if diff := cmp.Diff(tc.expectedResp, resp, nodeComparer); diff != "" {
191209
t.Errorf("NodeGetVolumeStats(%s): -want, +got \n%s", req, diff)
192210
}
193211
})

‎test/sanity/sanity_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"github.com/google/uuid"
2727
"google.golang.org/grpc"
2828

29-
sanity "github.com/kubernetes-csi/csi-test/v4/pkg/sanity"
29+
sanity "github.com/kubernetes-csi/csi-test/v5/pkg/sanity"
3030
compute "google.golang.org/api/compute/v1"
3131
common "sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/common"
3232
"sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/pkg/deviceutils"

‎vendor/github.com/cespare/xxhash/v2/README.md

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

0 commit comments

Comments
 (0)