Skip to content

Commit eb45013

Browse files
authored
Merge pull request #243 from renukasingare/k8upgrade_5.2
upgrade K8s version
2 parents a6a35c6 + f23d33c commit eb45013

File tree

11 files changed

+117
-113
lines changed

11 files changed

+117
-113
lines changed

go.mod

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/kubernetes-sigs/ibm-vpc-block-csi-driver
33
go 1.25.3
44

55
require (
6-
github.com/IBM/ibm-csi-common v1.1.23
7-
github.com/IBM/ibmcloud-volume-interface v1.2.16
8-
github.com/IBM/ibmcloud-volume-vpc v1.1.20
6+
github.com/IBM/ibm-csi-common v1.1.24
7+
github.com/IBM/ibmcloud-volume-interface v1.2.18
8+
github.com/IBM/ibmcloud-volume-vpc v1.1.21
99
github.com/IBM/secret-utils-lib v1.1.15
1010
github.com/container-storage-interface/spec v1.11.0
1111
github.com/golang/glog v1.2.4
@@ -19,8 +19,8 @@ require (
1919
google.golang.org/grpc v1.65.0
2020
google.golang.org/protobuf v1.36.1
2121
k8s.io/klog/v2 v2.130.1
22-
k8s.io/kubernetes v1.32.8
23-
k8s.io/mount-utils v0.32.8
22+
k8s.io/kubernetes v1.32.10
23+
k8s.io/mount-utils v0.32.10
2424
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
2525
)
2626

@@ -97,13 +97,13 @@ require (
9797
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9898
gopkg.in/yaml.v2 v2.4.0 // indirect
9999
gopkg.in/yaml.v3 v3.0.1 // indirect
100-
k8s.io/api v0.32.8 // indirect
101-
k8s.io/apiextensions-apiserver v0.32.8 // indirect
102-
k8s.io/apimachinery v0.32.8 // indirect
103-
k8s.io/apiserver v0.32.8 // indirect
104-
k8s.io/client-go v0.32.8 // indirect
105-
k8s.io/component-base v0.32.8 // indirect
106-
k8s.io/controller-manager v0.32.8 // indirect
100+
k8s.io/api v0.32.10 // indirect
101+
k8s.io/apiextensions-apiserver v0.32.10 // indirect
102+
k8s.io/apimachinery v0.32.10 // indirect
103+
k8s.io/apiserver v0.32.10 // indirect
104+
k8s.io/client-go v0.32.10 // indirect
105+
k8s.io/component-base v0.32.10 // indirect
106+
k8s.io/controller-manager v0.32.10 // indirect
107107
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
108108
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
109109
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
@@ -112,18 +112,18 @@ require (
112112

113113
// The below fixes the "go list -mod=readonly -m all" execution
114114
replace (
115-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.8
116-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.8
117-
k8s.io/cri-api => k8s.io/cri-api v0.32.8
118-
k8s.io/cri-client => k8s.io/cri-client v0.32.8
119-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.8
120-
k8s.io/endpointslice => k8s.io/endpointslice v0.32.8
121-
k8s.io/externaljwt => k8s.io/externaljwt v0.32.8
122-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.8
123-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.8
124-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.8
125-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.8
126-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.8
127-
k8s.io/metrics => k8s.io/metrics v0.32.8
128-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.8
115+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.10
116+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.10
117+
k8s.io/cri-api => k8s.io/cri-api v0.32.10
118+
k8s.io/cri-client => k8s.io/cri-client v0.32.10
119+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.10
120+
k8s.io/endpointslice => k8s.io/endpointslice v0.32.10
121+
k8s.io/externaljwt => k8s.io/externaljwt v0.32.10
122+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.10
123+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.10
124+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.10
125+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.10
126+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.10
127+
k8s.io/metrics => k8s.io/metrics v0.32.10
128+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.10
129129
)

go.sum

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7 h1:eHgfQl6IeSmzWUyiSi13CvoFYsovoyq
66
github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs=
77
github.com/IBM/go-sdk-core/v5 v5.17.4 h1:VGb9+mRrnS2HpHZFM5hy4J6ppIWnwNrw0G+tLSgcJLc=
88
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
9-
github.com/IBM/ibm-csi-common v1.1.23 h1:JmsvVXMFm93It6tH8U4gWIBzJY66e+rbrqV1vN/AxCA=
10-
github.com/IBM/ibm-csi-common v1.1.23/go.mod h1:QW28zxMAqx8O1iMK57rK/C4CBnLuAol+0mNDZ3asOA8=
11-
github.com/IBM/ibmcloud-volume-interface v1.2.16 h1:aSvOkRvwF12kV7g0InL/78RdTvR0nHHMhK53oFzwlgQ=
12-
github.com/IBM/ibmcloud-volume-interface v1.2.16/go.mod h1:6YW1kBJtlEDzqhyYLIvmCN2fRpeE5Gnq4n1q9h+K1M0=
13-
github.com/IBM/ibmcloud-volume-vpc v1.1.20 h1:ElDCmnuIf5kF51OsfNbJ5hTQyxH8JeGC89HPE4aorgI=
14-
github.com/IBM/ibmcloud-volume-vpc v1.1.20/go.mod h1:fycyLokKQVT8/tcZIUa3WkQInesvZow6YopVsXOmtes=
9+
github.com/IBM/ibm-csi-common v1.1.24 h1:uHgWTtXcQO7FxEEoRpBcLUD1yNFmdLi4mEC5zZdPFXw=
10+
github.com/IBM/ibm-csi-common v1.1.24/go.mod h1:QW28zxMAqx8O1iMK57rK/C4CBnLuAol+0mNDZ3asOA8=
11+
github.com/IBM/ibmcloud-volume-interface v1.2.18 h1:JwoZe4mP7GsNoAywagf48h/65FXHi2NKn9SLD6ZYiIo=
12+
github.com/IBM/ibmcloud-volume-interface v1.2.18/go.mod h1:2gOMNp05rLXkfWtL9wvPHuQph2kFFwbczPpFFThAy38=
13+
github.com/IBM/ibmcloud-volume-vpc v1.1.21 h1:jRziFUPS25S+/hhuj0GPt1y+jvUz2Yy/apsLGrVlHRU=
14+
github.com/IBM/ibmcloud-volume-vpc v1.1.21/go.mod h1:Zrlx5rr2r+dg2Iz+YfZ5dpFWGkQdIeauYHG9xZyEExI=
1515
github.com/IBM/secret-common-lib v1.1.14 h1:EdEFOdhYrDRc2+2u9SLQznUnbnDDq4f9RHx0eAuFd+E=
1616
github.com/IBM/secret-common-lib v1.1.14/go.mod h1:bSCfMHVgnl31H0CDxz5qxlHH7dtcDxTU703TniZzAsw=
1717
github.com/IBM/secret-utils-lib v1.1.15 h1:wW6/TdsjQVz/WDg7yQjD8Jmvb2NqYE851pDYxJVOo3s=
@@ -367,29 +367,29 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
367367
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
368368
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
369369
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
370-
k8s.io/api v0.32.8 h1:PhuKPnqsaXYuwmLXRLAmdDJ9EZ2R2kEbOZTq4UE3lGc=
371-
k8s.io/api v0.32.8/go.mod h1:gdRZQ4zXGawr9YrJ5OjTl7aR3TD0mTowtFsqFtpCDXo=
372-
k8s.io/apiextensions-apiserver v0.32.8 h1:iYIIaZmn/BMTwzGYRZnYZysaKB4t2TL3O+0yhmbXE2U=
373-
k8s.io/apiextensions-apiserver v0.32.8/go.mod h1:GTGskWgcBo/7boX33zcS8JY6vaG4s728AdbQPxtheVk=
374-
k8s.io/apimachinery v0.32.8 h1:95I+2jX71Tev+C+UlhNbmKfv+A/TQII42HLskiHZpBg=
375-
k8s.io/apimachinery v0.32.8/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
376-
k8s.io/apiserver v0.32.8 h1:QRXnrAxVsKMHW9BinWwhbD0oh78yE817UlLVTTYa3wY=
377-
k8s.io/apiserver v0.32.8/go.mod h1:tqqhcCOS8MRUiNncD7DNsyRWXw04AUJSRISTX4D3FsQ=
378-
k8s.io/client-go v0.32.8 h1:BkSFWUtRz/BbE3DJF98KPg7ix6lwMnIQ9DnHw3iWiSw=
379-
k8s.io/client-go v0.32.8/go.mod h1:vGkCzRxZ7BuRX2zdW7+kOwCdcgOkq9omDWb26wk/sE0=
380-
k8s.io/component-base v0.32.8 h1:Ez5yxl4Apas9m0gUQfwD60GbMyhfHPbvaYzQkpBDE6k=
381-
k8s.io/component-base v0.32.8/go.mod h1:zrTYhjPNFrItmyFEPiRIL9pgZa4jIgOUyOwrEL7xb10=
382-
k8s.io/controller-manager v0.32.8 h1:+Hi8eIx1xu0qA55kreJ1b9jjrjAnBPC/wIHJWgRdl5o=
383-
k8s.io/controller-manager v0.32.8/go.mod h1:VVliUUeC4M1DX1IFiOEHy2Ssi0GU9AnQpgcJlpO6u50=
370+
k8s.io/api v0.32.10 h1:ocp4turNfa1V40TuBW/LuA17TeXG9g/GI2ebg0KxBNk=
371+
k8s.io/api v0.32.10/go.mod h1:AsMsc4b6TuampYqgMEGSv0HBFpRS4BlKTXAVCAa7oF4=
372+
k8s.io/apiextensions-apiserver v0.32.10 h1:mAZT8fX/jM9pl7qWkFhhsjQZ8ZkmAhEivfUNw8uKXmo=
373+
k8s.io/apiextensions-apiserver v0.32.10/go.mod h1:wEvqU9kFUQOYminqrroY6+fvSs6iMb7QiiFmcN3b6KY=
374+
k8s.io/apimachinery v0.32.10 h1:SAg2kUPLYRcBJQj66oniP1BnXSqw+l1GvJFsJlBmVvQ=
375+
k8s.io/apimachinery v0.32.10/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
376+
k8s.io/apiserver v0.32.10 h1:nRUv9Q/OFHVjl/50TgNDlzw37wjTI0j+Ywp0gWqvQfs=
377+
k8s.io/apiserver v0.32.10/go.mod h1:BV9Wgt44Rop5I0cYsh2NYQstHu16ou4uirh95yTbioc=
378+
k8s.io/client-go v0.32.10 h1:MFmIjsKtcnn7mStjrJG1ZW2WzLsKKn6ZtL9hHM/W0xU=
379+
k8s.io/client-go v0.32.10/go.mod h1:qJy/Ws3zSwnu/nD75D+/of1uxbwWHxrYT5P3FuobVLI=
380+
k8s.io/component-base v0.32.10 h1:9+8Pw0fasOWPNHeQKmf38TFI7Zdi1k38sOIm0jQdSV4=
381+
k8s.io/component-base v0.32.10/go.mod h1:Tou3W1f6+8i5svBQ0Sef3jpkSZ0k6q2QdXbQSn4c9do=
382+
k8s.io/controller-manager v0.32.10 h1:B2rGlwJfCBYSf1AXf9FQkrvS98Fqg0RZh0gud30mkZY=
383+
k8s.io/controller-manager v0.32.10/go.mod h1:Jl6E8fwRfg0sSY/Schef/9UKdIlxRmnyaa3ZUaVeay4=
384384
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
385385
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
386386
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
387387
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
388388
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
389-
k8s.io/kubernetes v1.32.8 h1:NePHsWPIT9NQZ9w5QT/chJMuwjFFGGZxalvD6FlOjlw=
390-
k8s.io/kubernetes v1.32.8/go.mod h1:REY0Gok66BTTrbGyZaFMNKO9JhxvgBDW9B7aksWRFoY=
391-
k8s.io/mount-utils v0.32.8 h1:xe/0LiH2URGPM4dTyhvivRdUiUfyssPeUODRekw3Pxg=
392-
k8s.io/mount-utils v0.32.8/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
389+
k8s.io/kubernetes v1.32.10 h1:yiRa8DyKp4Yrbv028MP6kpp5N1N3eO8Hp/tSCbBGIPE=
390+
k8s.io/kubernetes v1.32.10/go.mod h1:o2pRStsMR7Uq62zcugfUEQsxnuyFt9r8migMrbsVH00=
391+
k8s.io/mount-utils v0.32.10 h1:cSz/3jAaPTkSfJUOfOTB0HPCZYcxZaY2moDiRBS96LU=
392+
k8s.io/mount-utils v0.32.10/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0=
393393
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
394394
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
395395
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

tests/sanity/sanity_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ func (c *fakeProviderSession) DeleteSnapshot(snap *provider.Snapshot) error {
532532
}
533533

534534
// Get the snapshot
535-
func (c *fakeProviderSession) GetSnapshot(snapshotID string) (*provider.Snapshot, error) {
535+
func (c *fakeProviderSession) GetSnapshot(snapshotID string, _ ...string) (*provider.Snapshot, error) {
536536
fmt.Println("GetSnapshot", c.snapshots)
537537
fmt.Println("snapshotID", snapshotID)
538538
fmt.Println("c.snapshots[snapshotID]", c.snapshots[snapshotID])
@@ -571,7 +571,7 @@ func (c *fakeProviderSession) ListSnapshots(maxResults int, nextToken string, ta
571571
}
572572

573573
// Get the snapshot By name
574-
func (c *fakeProviderSession) GetSnapshotByName(snapshotName string) (*provider.Snapshot, error) {
574+
func (c *fakeProviderSession) GetSnapshotByName(snapshotName string, _ ...string) (*provider.Snapshot, error) {
575575
if len(snapshotName) == 0 {
576576
return nil, errors.New("no name passed")
577577
}

vendor/github.com/IBM/ibm-csi-common/pkg/metadata/fakemetadata.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/IBM/ibm-csi-common/pkg/metadata/metadata.go

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/default_volume_provider.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/fake/fake_session.go

Lines changed: 20 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/snapshot_manager.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/IBM/ibmcloud-volume-vpc/block/provider/get_snapshot.go

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)