Skip to content

Commit

Permalink
Support for update Volume tags via RIAAS (#212)
Browse files Browse the repository at this point in the history 
* Support for update Volume tags via RIAAS

* Support for update Volume tags via RIAAS

* Support for update Volume tags via RIAAS

* Support for update Volume tags via RIAAS

* Support for update Volume tags via RIAAS
  • Loading branch information
@sameshai
sameshai authored Jan 30, 2025
1 parent 398e155 commit ad9d3f2
Show file tree
Hide file tree
Showing 29 changed files with 430 additions and 102 deletions.
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"github.com/IBM/ibm-csi-common/pkg/metrics"
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
"github.com/IBM/ibm-csi-common/pkg/utils"
"github.com/IBM/ibm-csi-common/pkg/watcher"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
"github.com/IBM/ibmcloud-volume-vpc/pkg/watcher"
csiConfig "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/config"
driver "github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/pkg/ibmcsidriver"
"go.uber.org/zap"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.22.0

require (
github.com/IBM/ibm-csi-common v1.1.15
github.com/IBM/ibmcloud-volume-interface v1.2.6
github.com/IBM/ibmcloud-volume-vpc v1.1.11
github.com/IBM/ibmcloud-volume-interface v1.2.9
github.com/IBM/ibmcloud-volume-vpc v1.1.14
github.com/IBM/secret-utils-lib v1.1.11
github.com/container-storage-interface/spec v1.9.0
github.com/golang/glog v1.2.1
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ github.com/IBM/go-sdk-core/v5 v5.17.4 h1:VGb9+mRrnS2HpHZFM5hy4J6ppIWnwNrw0G+tLSg
github.com/IBM/go-sdk-core/v5 v5.17.4/go.mod h1:KsAAI7eStAWwQa4F96MLy+whYSh39JzNjklZRbN/8ns=
github.com/IBM/ibm-csi-common v1.1.15 h1:oJ0NsrVBqfXKCZXSc/EI+s7/RlUK/TpzTI+jcdoAqpI=
github.com/IBM/ibm-csi-common v1.1.15/go.mod h1:oKYsmovJ4HAmbHfhQvVn1dJ+xeQHqaa3hQsN/Z5itlc=
github.com/IBM/ibmcloud-volume-interface v1.2.6 h1:OLumrSQ0XTOp6gW+k0z2X53uTYOIt1wWSkTCXzK/vAM=
github.com/IBM/ibmcloud-volume-interface v1.2.6/go.mod h1:sDeQiPuN8k9yTRl9FbE2GZCXPNg4cV3oldUfL8wwGNA=
github.com/IBM/ibmcloud-volume-vpc v1.1.11 h1:HnDPi7ZN+iAPVLZ29sLeQnJ7y0lvorc8/q4csDnxht4=
github.com/IBM/ibmcloud-volume-vpc v1.1.11/go.mod h1:V4Xw+ETu4nnIHn8lZ8T/tD6UlCTSDLt4kT8oEs4o80w=
github.com/IBM/ibmcloud-volume-interface v1.2.9 h1:ug55V2mzK/IaFkfuKDOt74yzhLapSR/+qVgfQblfAjw=
github.com/IBM/ibmcloud-volume-interface v1.2.9/go.mod h1:sDeQiPuN8k9yTRl9FbE2GZCXPNg4cV3oldUfL8wwGNA=
github.com/IBM/ibmcloud-volume-vpc v1.1.14 h1:rs8f4OO+lP3jOIi5tpgiWVyVEL6g4lazGfMEsLpsfUI=
github.com/IBM/ibmcloud-volume-vpc v1.1.14/go.mod h1:CSAsBgEXN6WL8y/EpEj9GA+w+vs3fVLoRadtuCWUAz8=
github.com/IBM/secret-common-lib v1.1.11 h1:EpfEe1gT1bnFQ3bxQPrh6bzTPeGjUo1NReVkCCP+TOc=
github.com/IBM/secret-common-lib v1.1.11/go.mod h1:7YJF0ipT979nHIPkiCpvjFboFoIhrmYnIliE1vjCjZM=
github.com/IBM/secret-utils-lib v1.1.11 h1:w87BzkddoFFlhRuWRteuGj3/561lEUg6Oo0RajVC87A=
Expand Down Expand Up @@ -121,8 +121,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM=
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k=
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
Expand Down Expand Up @@ -299,8 +299,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
2 changes: 1 addition & 1 deletion pkg/ibmcsidriver/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"strings"
"time"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
commonError "github.com/IBM/ibm-csi-common/pkg/messages"
"github.com/IBM/ibm-csi-common/pkg/metrics"
"github.com/IBM/ibm-csi-common/pkg/utils"
"github.com/IBM/ibmcloud-volume-interface/lib/provider"
providerError "github.com/IBM/ibmcloud-volume-interface/lib/utils"
utilReasonCode "github.com/IBM/ibmcloud-volume-interface/lib/utils/reasoncode"
userError "github.com/IBM/ibmcloud-volume-vpc/common/messages"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
csi "github.com/container-storage-interface/spec/lib/go/csi"

"go.uber.org/zap"
Expand Down
32 changes: 13 additions & 19 deletions pkg/ibmcsidriver/controller_helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"fmt"
"testing"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
"github.com/IBM/ibm-csi-common/pkg/utils"
"github.com/IBM/ibmcloud-volume-interface/config"
"github.com/IBM/ibmcloud-volume-interface/lib/provider"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
csi "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/stretchr/testify/assert"
)
Expand Down Expand Up @@ -177,9 +177,8 @@ func TestGetVolumeParameters(t *testing.T) {
},
expectedVolume: &provider.Volume{Name: &volumeName,
Capacity: &volumeSize,
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
Tags: []string{createdByIBM},
},
VPCVolume: provider.VPCVolume{
Tags: []string{createdByIBM},
Profile: &provider.Profile{Name: "general-purpose"},
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
},
Expand Down Expand Up @@ -312,9 +311,8 @@ func TestGetVolumeParameters(t *testing.T) {
},
expectedVolume: &provider.Volume{Name: &volumeName,
Capacity: &volumeSize,
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
Tags: []string{createdByIBM},
},
VPCVolume: provider.VPCVolume{
Tags: []string{createdByIBM},
Profile: &provider.Profile{Name: "general-purpose"},
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
},
Expand Down Expand Up @@ -444,9 +442,8 @@ func TestOverrideParams(t *testing.T) {
},
expectedVolume: &provider.Volume{Name: &volumeName,
Capacity: &volumeSize,
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
Tags: []string{createdByIBM},
},
VPCVolume: provider.VPCVolume{
Tags: []string{createdByIBM},
Profile: &provider.Profile{Name: "general-purpose"},
ResourceGroup: &provider.ResourceGroup{ID: "secret-rg"},
},
Expand Down Expand Up @@ -530,9 +527,8 @@ func TestOverrideParams(t *testing.T) {
},
expectedVolume: &provider.Volume{Name: &volumeName,
Capacity: &volumeSize,
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
Tags: []string{createdByIBM},
},
VPCVolume: provider.VPCVolume{
Tags: []string{createdByIBM},
Profile: &provider.Profile{Name: "custom"},
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
},
Expand Down Expand Up @@ -650,9 +646,8 @@ func TestCreateCSIVolumeResponse(t *testing.T) {
{
testCaseName: "Valid volume response",
requestVol: provider.Volume{VolumeID: volumeID,
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
Tags: []string{createdByIBM},
},
VPCVolume: provider.VPCVolume{
Tags: []string{createdByIBM},
Profile: &provider.Profile{Name: "general-purpose"},
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
},
Expand Down Expand Up @@ -682,9 +677,8 @@ func TestCreateCSIVolumeResponse(t *testing.T) {
{
testCaseName: "Valid volume response with region in vol request empty",
requestVol: provider.Volume{VolumeID: volumeID,
VPCVolume: provider.VPCVolume{VPCBlockVolume: provider.VPCBlockVolume{
Tags: []string{createdByIBM},
},
VPCVolume: provider.VPCVolume{
Tags: []string{createdByIBM},
Profile: &provider.Profile{Name: "general-purpose"},
ResourceGroup: &provider.ResourceGroup{ID: "myresourcegroups"},
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/ibmcsidriver/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
csi "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/stretchr/testify/assert"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
"github.com/IBM/ibmcloud-volume-interface/lib/provider/fake"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
"golang.org/x/net/context"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ibmcsidriver/fileOps_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"testing"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
"github.com/kubernetes-sigs/ibm-vpc-block-csi-driver/pkg/ibmcsidriver/ibmcsidriverfakes"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ibmcsidriver/ibm_csi_driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ package ibmcsidriver
import (
"fmt"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
commonError "github.com/IBM/ibm-csi-common/pkg/messages"
nodeMetadata "github.com/IBM/ibm-csi-common/pkg/metadata"
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
"github.com/IBM/ibm-csi-common/pkg/utils"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
csi "github.com/container-storage-interface/spec/lib/go/csi"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/ibmcsidriver/ibm_csi_driver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
testingexec "k8s.io/utils/exec/testing"
"testing"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
nodeMetadata "github.com/IBM/ibm-csi-common/pkg/metadata"
nodeInfo "github.com/IBM/ibm-csi-common/pkg/metadata/fake"
mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ibmcsidriver/node_helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package ibmcsidriver
import (
"testing"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/ibmcsidriver/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"flag"
"testing"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion tests/sanity/sanity_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

cloudProvider "github.com/IBM/ibm-csi-common/pkg/ibmcloudprovider"
nodeMetadata "github.com/IBM/ibm-csi-common/pkg/metadata"
cloudProvider "github.com/IBM/ibmcloud-volume-vpc/pkg/ibmcloudprovider"

mountManager "github.com/IBM/ibm-csi-common/pkg/mountmanager"

Expand Down
3 changes: 2 additions & 1 deletion vendor/github.com/IBM/ibmcloud-volume-interface/lib/provider/vpc_data_types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 14 additions & 8 deletions vendor/github.com/IBM/ibmcloud-volume-vpc/block/provider/create_volume.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

73 changes: 69 additions & 4 deletions vendor/github.com/IBM/ibmcloud-volume-vpc/block/provider/update_volume.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ad9d3f2

Please sign in to comment.