From 982d2df051d6d6963fccf68857d8860bc94fecb4 Mon Sep 17 00:00:00 2001 From: Renuka Date: Tue, 16 Sep 2025 16:53:07 +0530 Subject: [PATCH] upgraded k8 version from 32.6 to 32.8 Signed-off-by: Renuka --- go.mod | 28 +++---- go.sum | 56 ++++++------- .../pkg/messages/messages_en.go | 8 +- .../pkg/messages/reason_code.go | 3 + .../lib/provider/default_volume_provider.go | 5 ++ .../lib/provider/fake/fake_session.go | 79 +++++++++++++++++++ .../lib/provider/volume_manager.go | 3 + .../lib/provider/vpc_data_types.go | 20 ++++- .../block/provider/util.go | 1 + vendor/modules.txt | 28 +++---- 10 files changed, 171 insertions(+), 60 deletions(-) diff --git a/go.mod b/go.mod index eb4669ea..8a83a497 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module github.com/kubernetes-sigs/ibm-vpc-block-csi-driver go 1.23.10 require ( - github.com/IBM/ibm-csi-common v1.1.21 - github.com/IBM/ibmcloud-volume-interface v1.2.13 - github.com/IBM/ibmcloud-volume-vpc v1.1.19 - github.com/IBM/secret-utils-lib v1.1.14 + github.com/IBM/ibm-csi-common v1.1.23 + github.com/IBM/ibmcloud-volume-interface v1.2.16 + github.com/IBM/ibmcloud-volume-vpc v1.1.20 + github.com/IBM/secret-utils-lib v1.1.15 github.com/container-storage-interface/spec v1.11.0 github.com/golang/glog v1.2.4 github.com/google/uuid v1.6.0 @@ -19,8 +19,8 @@ require ( google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.36.1 k8s.io/klog/v2 v2.130.1 - k8s.io/kubernetes v1.32.6 - k8s.io/mount-utils v0.32.6 + k8s.io/kubernetes v1.32.8 + k8s.io/mount-utils v0.32.8 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 ) @@ -28,7 +28,7 @@ require ( github.com/BurntSushi/toml v1.0.0 // indirect github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7 // indirect github.com/IBM/go-sdk-core/v5 v5.17.4 // indirect - github.com/IBM/secret-common-lib v1.1.13 // indirect + github.com/IBM/secret-common-lib v1.1.14 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect @@ -97,13 +97,13 @@ require ( gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.32.6 // indirect - k8s.io/apiextensions-apiserver v0.32.6 // indirect - k8s.io/apimachinery v0.32.6 // indirect - k8s.io/apiserver v0.32.6 // indirect - k8s.io/client-go v0.32.6 // indirect - k8s.io/component-base v0.32.6 // indirect - k8s.io/controller-manager v0.32.6 // indirect + k8s.io/api v0.32.8 // indirect + k8s.io/apiextensions-apiserver v0.32.8 // indirect + k8s.io/apimachinery v0.32.8 // indirect + k8s.io/apiserver v0.32.8 // indirect + k8s.io/client-go v0.32.8 // indirect + k8s.io/component-base v0.32.8 // indirect + k8s.io/controller-manager v0.32.8 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect diff --git a/go.sum b/go.sum index 7ac84549..fc0c7bda 100644 --- a/go.sum +++ b/go.sum @@ -6,16 +6,16 @@ github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7 h1:eHgfQl6IeSmzWUyiSi13CvoFYsovoyq github.com/IBM-Cloud/ibm-cloud-cli-sdk v0.6.7/go.mod h1:RiUvKuHKTBmBApDMUQzBL14pQUGKcx/IioKQPIcRQjs= github.com/IBM/go-sdk-core/v5 v5.17.4 h1:VGb9+mRrnS2HpHZFM5hy4J6ppIWnwNrw0G+tLSgcJLc= github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns= -github.com/IBM/ibm-csi-common v1.1.21 h1:/OmjpF+YgmkLmtehFmmfWp9kHGP9iMNkTU/KQDYXzrY= -github.com/IBM/ibm-csi-common v1.1.21/go.mod h1:AgjHhkYgDwYz1OmFGTgtOv+GCMsD67Yel+ZKsY90PYY= -github.com/IBM/ibmcloud-volume-interface v1.2.13 h1:7/uANoxNafhB0npJMUJfcFWgiUiovlcYudsk3mucY1g= -github.com/IBM/ibmcloud-volume-interface v1.2.13/go.mod h1:F9QxX6NZ4LLPGQ6YWVnYpW0JV+H+pZp8RY10PAZ76JA= -github.com/IBM/ibmcloud-volume-vpc v1.1.19 h1:HAiszflqye6W8QJDL8InvTQtWuzR8JrKQUBqd/7zAC8= -github.com/IBM/ibmcloud-volume-vpc v1.1.19/go.mod h1:fln7dUu9AnjLzxYXXcILl6FSHzr/ZAnfY9iZx/DOQTA= -github.com/IBM/secret-common-lib v1.1.13 h1:94YIuXew6lBXf0cfhyfM1iNUbUsV34abc4+BGvnXCTQ= -github.com/IBM/secret-common-lib v1.1.13/go.mod h1:33mQHLZyAq7HmS9SYDQXpf0OhBhe4TRHDaRBktDxnm0= -github.com/IBM/secret-utils-lib v1.1.14 h1:Gv5Ca2hZTQMr9+PkOq7AE2lUUnNEeQJ0uiKaxKT1Sdk= -github.com/IBM/secret-utils-lib v1.1.14/go.mod h1:wAAmS6JOrgcASOuyDkclmxWdKMcbVxshW5QWlMn21X8= +github.com/IBM/ibm-csi-common v1.1.23 h1:JmsvVXMFm93It6tH8U4gWIBzJY66e+rbrqV1vN/AxCA= +github.com/IBM/ibm-csi-common v1.1.23/go.mod h1:QW28zxMAqx8O1iMK57rK/C4CBnLuAol+0mNDZ3asOA8= +github.com/IBM/ibmcloud-volume-interface v1.2.16 h1:aSvOkRvwF12kV7g0InL/78RdTvR0nHHMhK53oFzwlgQ= +github.com/IBM/ibmcloud-volume-interface v1.2.16/go.mod h1:6YW1kBJtlEDzqhyYLIvmCN2fRpeE5Gnq4n1q9h+K1M0= +github.com/IBM/ibmcloud-volume-vpc v1.1.20 h1:ElDCmnuIf5kF51OsfNbJ5hTQyxH8JeGC89HPE4aorgI= +github.com/IBM/ibmcloud-volume-vpc v1.1.20/go.mod h1:fycyLokKQVT8/tcZIUa3WkQInesvZow6YopVsXOmtes= +github.com/IBM/secret-common-lib v1.1.14 h1:EdEFOdhYrDRc2+2u9SLQznUnbnDDq4f9RHx0eAuFd+E= +github.com/IBM/secret-common-lib v1.1.14/go.mod h1:bSCfMHVgnl31H0CDxz5qxlHH7dtcDxTU703TniZzAsw= +github.com/IBM/secret-utils-lib v1.1.15 h1:wW6/TdsjQVz/WDg7yQjD8Jmvb2NqYE851pDYxJVOo3s= +github.com/IBM/secret-utils-lib v1.1.15/go.mod h1:Hbslikwj+zwxz4MYKqckSmcGYcxB1w5EkwHJHa+kxgQ= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -367,29 +367,29 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.32.6 h1:UiBAMRzTP24Tz9UT1uhhmAv1auGTT9PT/npywSk9JrU= -k8s.io/api v0.32.6/go.mod h1:+iFCyQN34v2rsL53iQEN9lYE03mFdgPvgSXvATIDteg= -k8s.io/apiextensions-apiserver v0.32.6 h1:B9zv1tpW+090Prav3GP53A4W2Bv908AAouZYJWp0fy8= -k8s.io/apiextensions-apiserver v0.32.6/go.mod h1:3lAgylV3582qpXg8NWW4NOLdzxLC8mTcfPqqjAzOSTs= -k8s.io/apimachinery v0.32.6 h1:odtEUjg7OT3132sBFsFn4Arj4Gd+BplYekmLQP8L3ak= -k8s.io/apimachinery v0.32.6/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.32.6 h1:SKt+2e4klvHes4nw3moBI3mCPuh3RFp0XtYzsjZOOjk= -k8s.io/apiserver v0.32.6/go.mod h1:CleW9S9cdw3EAevI/RCFc7RtHTEgbcTFhZV28IEdRtU= -k8s.io/client-go v0.32.6 h1:Q+O+Sd9LKKFnsGZNVX2q1RDILYRpQZX+ea2RoIgjKlM= -k8s.io/client-go v0.32.6/go.mod h1:yqL9XJ2cTXy3WdJwdeyob3O6xiLwWrh9DP7SeszniW0= -k8s.io/component-base v0.32.6 h1:LwKaAlUcTyRouaqUdpQ+JLvtwyZlrWrNey1axNbE0ac= -k8s.io/component-base v0.32.6/go.mod h1:fFJq5U4s+BAjmTV5gnT9CIfRbVujyITuO93ambmplcE= -k8s.io/controller-manager v0.32.6 h1:hBnhPQQ1z8Ifdfjrg8mcOm3o3uttXxCtXtNB9okTKBI= -k8s.io/controller-manager v0.32.6/go.mod h1:O82IkfFfoEnXl1OB2muDkTXtDt6hob0uvxOyn/50B0A= +k8s.io/api v0.32.8 h1:PhuKPnqsaXYuwmLXRLAmdDJ9EZ2R2kEbOZTq4UE3lGc= +k8s.io/api v0.32.8/go.mod h1:gdRZQ4zXGawr9YrJ5OjTl7aR3TD0mTowtFsqFtpCDXo= +k8s.io/apiextensions-apiserver v0.32.8 h1:iYIIaZmn/BMTwzGYRZnYZysaKB4t2TL3O+0yhmbXE2U= +k8s.io/apiextensions-apiserver v0.32.8/go.mod h1:GTGskWgcBo/7boX33zcS8JY6vaG4s728AdbQPxtheVk= +k8s.io/apimachinery v0.32.8 h1:95I+2jX71Tev+C+UlhNbmKfv+A/TQII42HLskiHZpBg= +k8s.io/apimachinery v0.32.8/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.8 h1:QRXnrAxVsKMHW9BinWwhbD0oh78yE817UlLVTTYa3wY= +k8s.io/apiserver v0.32.8/go.mod h1:tqqhcCOS8MRUiNncD7DNsyRWXw04AUJSRISTX4D3FsQ= +k8s.io/client-go v0.32.8 h1:BkSFWUtRz/BbE3DJF98KPg7ix6lwMnIQ9DnHw3iWiSw= +k8s.io/client-go v0.32.8/go.mod h1:vGkCzRxZ7BuRX2zdW7+kOwCdcgOkq9omDWb26wk/sE0= +k8s.io/component-base v0.32.8 h1:Ez5yxl4Apas9m0gUQfwD60GbMyhfHPbvaYzQkpBDE6k= +k8s.io/component-base v0.32.8/go.mod h1:zrTYhjPNFrItmyFEPiRIL9pgZa4jIgOUyOwrEL7xb10= +k8s.io/controller-manager v0.32.8 h1:+Hi8eIx1xu0qA55kreJ1b9jjrjAnBPC/wIHJWgRdl5o= +k8s.io/controller-manager v0.32.8/go.mod h1:VVliUUeC4M1DX1IFiOEHy2Ssi0GU9AnQpgcJlpO6u50= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= -k8s.io/kubernetes v1.32.6 h1:tp1gRjOqZjaoFBek5PN6eSmODdS1QRrH5UKiFP8ZByg= -k8s.io/kubernetes v1.32.6/go.mod h1:REY0Gok66BTTrbGyZaFMNKO9JhxvgBDW9B7aksWRFoY= -k8s.io/mount-utils v0.32.6 h1:eUzjHqe7FPK54MGeZf5TAD29OlF9ChutDomXvp0E4gM= -k8s.io/mount-utils v0.32.6/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +k8s.io/kubernetes v1.32.8 h1:NePHsWPIT9NQZ9w5QT/chJMuwjFFGGZxalvD6FlOjlw= +k8s.io/kubernetes v1.32.8/go.mod h1:REY0Gok66BTTrbGyZaFMNKO9JhxvgBDW9B7aksWRFoY= +k8s.io/mount-utils v0.32.8 h1:xe/0LiH2URGPM4dTyhvivRdUiUfyssPeUODRekw3Pxg= +k8s.io/mount-utils v0.32.8/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= diff --git a/vendor/github.com/IBM/ibm-csi-common/pkg/messages/messages_en.go b/vendor/github.com/IBM/ibm-csi-common/pkg/messages/messages_en.go index 2c606d38..c47a8af2 100644 --- a/vendor/github.com/IBM/ibm-csi-common/pkg/messages/messages_en.go +++ b/vendor/github.com/IBM/ibm-csi-common/pkg/messages/messages_en.go @@ -143,9 +143,15 @@ var messagesEn = map[string]Message{ Type: codes.DeadlineExceeded, Action: "Wait for a few minutes and try again. If the error persists user can open a container network issue.", }, + ProfileNotAllowlisted: { + Code: FailedPrecondition, + Description: "'%s' profile is not accessible", + Type: codes.FailedPrecondition, + Action: "Please open support ticket on VPC for allowlisting. Once allowlisted please restart the CSI Driver", + }, FailedPrecondition: { Code: FailedPrecondition, - Description: "Provider is not ready to responde", + Description: "Provider is not ready to respond", Type: codes.FailedPrecondition, Action: "Please retry after some time, if problem persist then report issue to IKS storage team", }, diff --git a/vendor/github.com/IBM/ibm-csi-common/pkg/messages/reason_code.go b/vendor/github.com/IBM/ibm-csi-common/pkg/messages/reason_code.go index 7716e474..b0af041b 100644 --- a/vendor/github.com/IBM/ibm-csi-common/pkg/messages/reason_code.go +++ b/vendor/github.com/IBM/ibm-csi-common/pkg/messages/reason_code.go @@ -81,6 +81,9 @@ const ( // ObjectNotFound ... ObjectNotFound = "ObjectNotFound" + // ProfileNotAllowlisted ... + ProfileNotAllowlisted = "ProfileNotAllowlisted" + // FailedPrecondition ... FailedPrecondition = "FailedPrecondition" diff --git a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/default_volume_provider.go b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/default_volume_provider.go index 0769683b..39c90128 100644 --- a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/default_volume_provider.go +++ b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/default_volume_provider.go @@ -36,6 +36,11 @@ func (volprov *DefaultVolumeProvider) Type() VolumeType { return "" } +// GetVolumeProfileByName gets volume profile by name, +func (volprov *DefaultVolumeProvider) GetVolumeProfileByName(profileName string) (*Profile, error) { + return nil, nil +} + // CreateVolume creates a volume func (volprov *DefaultVolumeProvider) CreateVolume(VolumeRequest Volume) (*Volume, error) { return nil, nil diff --git a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/fake/fake_session.go b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/fake/fake_session.go index 7c1f0279..dfa79fe0 100644 --- a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/fake/fake_session.go +++ b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/fake/fake_session.go @@ -279,6 +279,19 @@ type FakeSession struct { result1 *provider.Volume result2 error } + GetVolumeProfileByNameStub func(string) (*provider.Profile, error) + getVolumeProfileByNameMutex sync.RWMutex + getVolumeProfileByNameArgsForCall []struct { + arg1 string + } + getVolumeProfileByNameReturns struct { + result1 *provider.Profile + result2 error + } + getVolumeProfileByNameReturnsOnCall map[int]struct { + result1 *provider.Profile + result2 error + } ListSnapshotsStub func(int, string, map[string]string) (*provider.SnapshotList, error) listSnapshotsMutex sync.RWMutex listSnapshotsArgsForCall []struct { @@ -1742,6 +1755,70 @@ func (fake *FakeSession) GetVolumeByRequestIDReturnsOnCall(i int, result1 *provi }{result1, result2} } +func (fake *FakeSession) GetVolumeProfileByName(arg1 string) (*provider.Profile, error) { + fake.getVolumeProfileByNameMutex.Lock() + ret, specificReturn := fake.getVolumeProfileByNameReturnsOnCall[len(fake.getVolumeProfileByNameArgsForCall)] + fake.getVolumeProfileByNameArgsForCall = append(fake.getVolumeProfileByNameArgsForCall, struct { + arg1 string + }{arg1}) + stub := fake.GetVolumeProfileByNameStub + fakeReturns := fake.getVolumeProfileByNameReturns + fake.recordInvocation("GetVolumeProfileByName", []interface{}{arg1}) + fake.getVolumeProfileByNameMutex.Unlock() + if stub != nil { + return stub(arg1) + } + if specificReturn { + return ret.result1, ret.result2 + } + return fakeReturns.result1, fakeReturns.result2 +} + +func (fake *FakeSession) GetVolumeProfileByNameCallCount() int { + fake.getVolumeProfileByNameMutex.RLock() + defer fake.getVolumeProfileByNameMutex.RUnlock() + return len(fake.getVolumeProfileByNameArgsForCall) +} + +func (fake *FakeSession) GetVolumeProfileByNameCalls(stub func(string) (*provider.Profile, error)) { + fake.getVolumeProfileByNameMutex.Lock() + defer fake.getVolumeProfileByNameMutex.Unlock() + fake.GetVolumeProfileByNameStub = stub +} + +func (fake *FakeSession) GetVolumeProfileByNameArgsForCall(i int) string { + fake.getVolumeProfileByNameMutex.RLock() + defer fake.getVolumeProfileByNameMutex.RUnlock() + argsForCall := fake.getVolumeProfileByNameArgsForCall[i] + return argsForCall.arg1 +} + +func (fake *FakeSession) GetVolumeProfileByNameReturns(result1 *provider.Profile, result2 error) { + fake.getVolumeProfileByNameMutex.Lock() + defer fake.getVolumeProfileByNameMutex.Unlock() + fake.GetVolumeProfileByNameStub = nil + fake.getVolumeProfileByNameReturns = struct { + result1 *provider.Profile + result2 error + }{result1, result2} +} + +func (fake *FakeSession) GetVolumeProfileByNameReturnsOnCall(i int, result1 *provider.Profile, result2 error) { + fake.getVolumeProfileByNameMutex.Lock() + defer fake.getVolumeProfileByNameMutex.Unlock() + fake.GetVolumeProfileByNameStub = nil + if fake.getVolumeProfileByNameReturnsOnCall == nil { + fake.getVolumeProfileByNameReturnsOnCall = make(map[int]struct { + result1 *provider.Profile + result2 error + }) + } + fake.getVolumeProfileByNameReturnsOnCall[i] = struct { + result1 *provider.Profile + result2 error + }{result1, result2} +} + func (fake *FakeSession) ListSnapshots(arg1 int, arg2 string, arg3 map[string]string) (*provider.SnapshotList, error) { fake.listSnapshotsMutex.Lock() ret, specificReturn := fake.listSnapshotsReturnsOnCall[len(fake.listSnapshotsArgsForCall)] @@ -2338,6 +2415,8 @@ func (fake *FakeSession) Invocations() map[string][][]interface{} { defer fake.getVolumeByNameMutex.RUnlock() fake.getVolumeByRequestIDMutex.RLock() defer fake.getVolumeByRequestIDMutex.RUnlock() + fake.getVolumeProfileByNameMutex.RLock() + defer fake.getVolumeProfileByNameMutex.RUnlock() fake.listSnapshotsMutex.RLock() defer fake.listSnapshotsMutex.RUnlock() fake.listVolumesMutex.RLock() diff --git a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/volume_manager.go b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/volume_manager.go index b788b6c1..bf0a7181 100644 --- a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/volume_manager.go +++ b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/volume_manager.go @@ -26,6 +26,9 @@ type VolumeManager interface { Type() VolumeType // Volume operations + // Get the volume profile by using profile name + GetVolumeProfileByName(name string) (*Profile, error) + // Create the volume with authorization by passing required information in the volume object CreateVolume(VolumeRequest Volume) (*Volume, error) diff --git a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/vpc_data_types.go b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/vpc_data_types.go index 5c2f38a4..25b9a25a 100644 --- a/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/vpc_data_types.go +++ b/vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/vpc_data_types.go @@ -124,9 +124,23 @@ type ResourceGroup struct { // Profile ... type Profile struct { - Href string `json:"href,omitempty"` - Name string `json:"name,omitempty"` - CRN string `json:"crn,omitempty"` + CRN string `json:"crn,omitempty"` + Href string `json:"href,omitempty"` + Name string `json:"name,omitempty"` + Capacity CapIops `json:"capacity,omitempty"` + Family string `json:"family,omitempty"` + Iops CapIops `json:"iops,omitempty"` + ResourceType string `json:"resource_type,omitempty"` +} + +// CapIops +type CapIops struct { + Default int32 `json:"default,omitempty"` + Max int32 `json:"max,omitempty"` + Min int32 `json:"min,omitempty"` + Step int32 `json:"step,omitempty"` + Type string `json:"type,omitempty"` + Value int32 `json:"value,omitempty"` } // VolumeAttachment ... diff --git a/vendor/github.com/IBM/ibmcloud-volume-vpc/block/provider/util.go b/vendor/github.com/IBM/ibmcloud-volume-vpc/block/provider/util.go index 3c8d305b..1f40890a 100644 --- a/vendor/github.com/IBM/ibmcloud-volume-vpc/block/provider/util.go +++ b/vendor/github.com/IBM/ibmcloud-volume-vpc/block/provider/util.go @@ -80,6 +80,7 @@ var skipErrorCodes = map[string]bool{ "validation_failed_anyof": true, "volume_profile_capacity_maxbandwidth_invalid": true, "validation_failed_pattern": true, + "volume_tags_update_failed": true, // IKS ms error code for skip re-try "ST0008": true, //resources not found diff --git a/vendor/modules.txt b/vendor/modules.txt index 9d79731e..687c6042 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8,7 +8,7 @@ github.com/IBM-Cloud/ibm-cloud-cli-sdk/common/rest # github.com/IBM/go-sdk-core/v5 v5.17.4 ## explicit; go 1.20 github.com/IBM/go-sdk-core/v5/core -# github.com/IBM/ibm-csi-common v1.1.21 +# github.com/IBM/ibm-csi-common v1.1.23 ## explicit; go 1.23.10 github.com/IBM/ibm-csi-common/pkg/messages github.com/IBM/ibm-csi-common/pkg/metadata @@ -16,7 +16,7 @@ github.com/IBM/ibm-csi-common/pkg/metadata/fake github.com/IBM/ibm-csi-common/pkg/metrics github.com/IBM/ibm-csi-common/pkg/mountmanager github.com/IBM/ibm-csi-common/pkg/utils -# github.com/IBM/ibmcloud-volume-interface v1.2.13 +# github.com/IBM/ibmcloud-volume-interface v1.2.16 ## explicit; go 1.23.10 github.com/IBM/ibmcloud-volume-interface/config github.com/IBM/ibmcloud-volume-interface/lib/metrics @@ -27,7 +27,7 @@ github.com/IBM/ibmcloud-volume-interface/lib/utils/reasoncode github.com/IBM/ibmcloud-volume-interface/provider/auth github.com/IBM/ibmcloud-volume-interface/provider/iam github.com/IBM/ibmcloud-volume-interface/provider/local -# github.com/IBM/ibmcloud-volume-vpc v1.1.19 +# github.com/IBM/ibmcloud-volume-vpc v1.1.20 ## explicit; go 1.23.10 github.com/IBM/ibmcloud-volume-vpc/block/provider github.com/IBM/ibmcloud-volume-vpc/block/utils @@ -45,11 +45,11 @@ github.com/IBM/ibmcloud-volume-vpc/common/vpcclient/vpcvolume github.com/IBM/ibmcloud-volume-vpc/iks/provider github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider github.com/IBM/ibmcloud-volume-vpc/pkg/watcher -# github.com/IBM/secret-common-lib v1.1.13 +# github.com/IBM/secret-common-lib v1.1.14 ## explicit; go 1.23.10 github.com/IBM/secret-common-lib/pkg/secret_provider github.com/IBM/secret-common-lib/pkg/utils -# github.com/IBM/secret-utils-lib v1.1.14 +# github.com/IBM/secret-utils-lib v1.1.15 ## explicit; go 1.23.10 github.com/IBM/secret-utils-lib/pkg/authenticator github.com/IBM/secret-utils-lib/pkg/config @@ -507,7 +507,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.6 +# k8s.io/api v0.32.8 ## explicit; go 1.23.0 k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1alpha1 @@ -566,10 +566,10 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.32.6 +# k8s.io/apiextensions-apiserver v0.32.8 ## explicit; go 1.23.0 k8s.io/apiextensions-apiserver/pkg/features -# k8s.io/apimachinery v0.32.6 +# k8s.io/apimachinery v0.32.8 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -625,11 +625,11 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.6 +# k8s.io/apiserver v0.32.8 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/features k8s.io/apiserver/pkg/util/feature -# k8s.io/client-go v0.32.6 +# k8s.io/client-go v0.32.8 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -833,7 +833,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.32.6 +# k8s.io/component-base v0.32.8 ## explicit; go 1.23.0 k8s.io/component-base/cli/flag k8s.io/component-base/featuregate @@ -843,7 +843,7 @@ k8s.io/component-base/metrics/prometheus/feature k8s.io/component-base/metrics/prometheusextension k8s.io/component-base/version k8s.io/component-base/zpages/features -# k8s.io/controller-manager v0.32.6 +# k8s.io/controller-manager v0.32.8 ## explicit; go 1.23.0 k8s.io/controller-manager/pkg/features # k8s.io/klog/v2 v2.130.1 @@ -866,14 +866,14 @@ k8s.io/kube-openapi/pkg/schemaconv k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubernetes v1.32.6 +# k8s.io/kubernetes v1.32.8 ## explicit; go 1.23.0 k8s.io/kubernetes/pkg/features k8s.io/kubernetes/pkg/kubelet/server/metrics k8s.io/kubernetes/pkg/volume/util/fs k8s.io/kubernetes/pkg/volume/util/fsquota k8s.io/kubernetes/pkg/volume/util/fsquota/common -# k8s.io/mount-utils v0.32.6 +# k8s.io/mount-utils v0.32.8 ## explicit; go 1.23.0 k8s.io/mount-utils # k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738