diff --git a/api/v1alpha5/filter_convert.go b/api/v1alpha5/filter_convert.go index ab89bdca75..42098aeda8 100644 --- a/api/v1alpha5/filter_convert.go +++ b/api/v1alpha5/filter_convert.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha5 import ( - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" ) func (subnetFilter SubnetFilter) ToListOpt() subnets.ListOpts { diff --git a/api/v1alpha6/filter_convert.go b/api/v1alpha6/filter_convert.go index 6205bcd51f..c95649b6fb 100644 --- a/api/v1alpha6/filter_convert.go +++ b/api/v1alpha6/filter_convert.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha6 import ( - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" ) func (subnetFilter SubnetFilter) ToListOpt() subnets.ListOpts { diff --git a/api/v1alpha7/filter_convert.go b/api/v1alpha7/filter_convert.go index 236c91fcd7..a3e7a104f8 100644 --- a/api/v1alpha7/filter_convert.go +++ b/api/v1alpha7/filter_convert.go @@ -17,10 +17,10 @@ limitations under the License. package v1alpha7 import ( - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - securitygroups "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" + securitygroups "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" ) func (securityGroupFilter SecurityGroupFilter) ToListOpt() securitygroups.ListOpts { diff --git a/api/v1alpha8/filter_convert.go b/api/v1alpha8/filter_convert.go index 378642ce5f..5b8a2083ed 100644 --- a/api/v1alpha8/filter_convert.go +++ b/api/v1alpha8/filter_convert.go @@ -17,11 +17,11 @@ limitations under the License. package v1alpha8 import ( - "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - securitygroups "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" + securitygroups "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" ) func (securityGroupFilter SecurityGroupFilter) ToListOpt() securitygroups.ListOpts { diff --git a/controllers/openstackcluster_controller_test.go b/controllers/openstackcluster_controller_test.go index b512ac62f4..a8a8d49a9f 100644 --- a/controllers/openstackcluster_controller_test.go +++ b/controllers/openstackcluster_controller_test.go @@ -22,16 +22,16 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/attachinterfaces" - "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/attachinterfaces" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/external" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/controllers/openstackfloatingippool_controller.go b/controllers/openstackfloatingippool_controller.go index a5887e88df..2e4175f612 100644 --- a/controllers/openstackfloatingippool_controller.go +++ b/controllers/openstackfloatingippool_controller.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/external" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/go.mod b/go.mod index 4c59f8ec77..6b891af231 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module sigs.k8s.io/cluster-api-provider-openstack -go 1.21 +go 1.21.6 + +toolchain go1.21.7 require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc @@ -8,14 +10,14 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.6.0 github.com/google/gofuzz v1.2.0 - github.com/gophercloud/gophercloud v1.7.0 - github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56 + github.com/gophercloud/gophercloud/v2 v2.0.0-beta.1 + github.com/gophercloud/utils/v2 v2.0.0-20240209190212-277d485b2674 github.com/hashicorp/go-version v1.4.0 github.com/onsi/ginkgo/v2 v2.13.1 github.com/onsi/gomega v1.30.0 github.com/prometheus/client_golang v1.17.0 github.com/spf13/pflag v1.0.5 - golang.org/x/crypto v0.15.0 + golang.org/x/crypto v0.19.0 golang.org/x/text v0.14.0 gopkg.in/ini.v1 v1.67.0 k8s.io/api v0.28.4 @@ -139,8 +141,8 @@ require ( golang.org/x/net v0.18.0 // indirect golang.org/x/oauth2 v0.14.0 // indirect golang.org/x/sync v0.4.0 // indirect - golang.org/x/sys v0.14.0 // indirect - golang.org/x/term v0.14.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/term v0.17.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.14.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index c5f22dace3..c1ea9a5c2b 100644 --- a/go.sum +++ b/go.sum @@ -258,11 +258,10 @@ github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gophercloud/gophercloud v1.3.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= -github.com/gophercloud/gophercloud v1.7.0 h1:fyJGKh0LBvIZKLvBWvQdIgkaV5yTM3Jh9EYUh+UNCAs= -github.com/gophercloud/gophercloud v1.7.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= -github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56 h1:sH7xkTfYzxIEgzq1tDHIMKRh1vThOEOGNsettdEeLbE= -github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56/go.mod h1:VSalo4adEk+3sNkmVJLnhHoOyOYYS8sTWLG4mv5BKto= +github.com/gophercloud/gophercloud/v2 v2.0.0-beta.1 h1:FYzj3NlCp3wTJahn9VHETY0WQlqWhHylkjhrZDAJpyQ= +github.com/gophercloud/gophercloud/v2 v2.0.0-beta.1/go.mod h1:p9iS4WRTI84BeqLH7Q7lu0V2UryWXvHQuqgThrB9xuU= +github.com/gophercloud/utils/v2 v2.0.0-20240209190212-277d485b2674 h1:98Y/uHHiza9NaWPguY2pVDV/CV9Pn+Ld7mqiyxHtqj0= +github.com/gophercloud/utils/v2 v2.0.0-20240209190212-277d485b2674/go.mod h1:f/tAN/7JNTrcInQkBm07WSfVgCcVS4Pa7Y4gbrHldV0= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= @@ -489,10 +488,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA= -golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -640,13 +638,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.14.0 h1:LGK9IlZ8T9jvdy6cTdfKUCltatMFOehAQo9SRC46UQ8= -golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkg/clients/compute.go b/pkg/clients/compute.go index 64ae059fc7..66b0283f02 100644 --- a/pkg/clients/compute.go +++ b/pkg/clients/compute.go @@ -19,15 +19,15 @@ package clients import ( "fmt" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/attachinterfaces" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" - "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" - "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/gophercloud/utils/openstack/clientconfig" - uflavors "github.com/gophercloud/utils/openstack/compute/v2/flavors" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/attachinterfaces" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/availabilityzones" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/servergroups" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" + "github.com/gophercloud/utils/v2/openstack/clientconfig" + uflavors "github.com/gophercloud/utils/v2/openstack/compute/v2/flavors" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" ) diff --git a/pkg/clients/image.go b/pkg/clients/image.go index 329cb951d6..b9c77e6cee 100644 --- a/pkg/clients/image.go +++ b/pkg/clients/image.go @@ -19,10 +19,10 @@ package clients import ( "fmt" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/gophercloud/utils/openstack/clientconfig" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack" + "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" + "github.com/gophercloud/utils/v2/openstack/clientconfig" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" ) diff --git a/pkg/clients/loadbalancer.go b/pkg/clients/loadbalancer.go index 7ec2b2c673..730a1ca4b1 100644 --- a/pkg/clients/loadbalancer.go +++ b/pkg/clients/loadbalancer.go @@ -19,15 +19,15 @@ package clients import ( "fmt" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/apiversions" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/providers" - "github.com/gophercloud/utils/openstack/clientconfig" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/apiversions" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/listeners" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/loadbalancers" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/monitors" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/pools" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/providers" + "github.com/gophercloud/utils/v2/openstack/clientconfig" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors" diff --git a/pkg/clients/mock/compute.go b/pkg/clients/mock/compute.go index 77e7b7a8b2..879e1dbe98 100644 --- a/pkg/clients/mock/compute.go +++ b/pkg/clients/mock/compute.go @@ -24,11 +24,11 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - attachinterfaces "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/attachinterfaces" - availabilityzones "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones" - servergroups "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" - flavors "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" - servers "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" + attachinterfaces "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/attachinterfaces" + availabilityzones "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/availabilityzones" + servergroups "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/servergroups" + flavors "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors" + servers "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" clients "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" ) diff --git a/pkg/clients/mock/image.go b/pkg/clients/mock/image.go index 890e2f01a7..690bd483aa 100644 --- a/pkg/clients/mock/image.go +++ b/pkg/clients/mock/image.go @@ -24,7 +24,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - images "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" + images "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" ) // MockImageClient is a mock of ImageClient interface. diff --git a/pkg/clients/mock/loadbalancer.go b/pkg/clients/mock/loadbalancer.go index 8958def90f..233bcbacad 100644 --- a/pkg/clients/mock/loadbalancer.go +++ b/pkg/clients/mock/loadbalancer.go @@ -24,12 +24,12 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - apiversions "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/apiversions" - listeners "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners" - loadbalancers "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers" - monitors "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors" - pools "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools" - providers "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/providers" + apiversions "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/apiversions" + listeners "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/listeners" + loadbalancers "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/loadbalancers" + monitors "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/monitors" + pools "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/pools" + providers "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/providers" ) // MockLbClient is a mock of LbClient interface. diff --git a/pkg/clients/mock/network.go b/pkg/clients/mock/network.go index 1493055a01..729e3dd035 100644 --- a/pkg/clients/mock/network.go +++ b/pkg/clients/mock/network.go @@ -24,16 +24,16 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - extensions "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions" - attributestags "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - floatingips "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - routers "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - groups "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - rules "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules" - trunks "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" - networks "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - ports "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - subnets "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + extensions "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions" + attributestags "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + floatingips "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips" + routers "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" + groups "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + rules "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/rules" + trunks "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" + networks "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + ports "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + subnets "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" ) // MockNetworkClient is a mock of NetworkClient interface. diff --git a/pkg/clients/mock/volume.go b/pkg/clients/mock/volume.go index 91237deb21..8fd4f61bf9 100644 --- a/pkg/clients/mock/volume.go +++ b/pkg/clients/mock/volume.go @@ -24,7 +24,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - volumes "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" + volumes "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes" ) // MockVolumeClient is a mock of VolumeClient interface. diff --git a/pkg/clients/networking.go b/pkg/clients/networking.go index 23ad3c8fdf..15a2638b0d 100644 --- a/pkg/clients/networking.go +++ b/pkg/clients/networking.go @@ -19,19 +19,19 @@ package clients import ( "fmt" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" - "github.com/gophercloud/utils/openstack/clientconfig" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/rules" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" + "github.com/gophercloud/utils/v2/openstack/clientconfig" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" ) diff --git a/pkg/clients/volume.go b/pkg/clients/volume.go index 32395863e7..68ca0b6c72 100644 --- a/pkg/clients/volume.go +++ b/pkg/clients/volume.go @@ -19,10 +19,10 @@ package clients import ( "fmt" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "github.com/gophercloud/utils/openstack/clientconfig" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack" + "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes" + "github.com/gophercloud/utils/v2/openstack/clientconfig" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" ) diff --git a/pkg/cloud/services/compute/availabilityzone.go b/pkg/cloud/services/compute/availabilityzone.go index 2f52f72265..c9a5bab0af 100644 --- a/pkg/cloud/services/compute/availabilityzone.go +++ b/pkg/cloud/services/compute/availabilityzone.go @@ -19,7 +19,7 @@ package compute import ( "fmt" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/availabilityzones" ) func (s *Service) GetAvailabilityZones() ([]availabilityzones.AvailabilityZone, error) { diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go index e5648a26f0..b480242b4d 100644 --- a/pkg/cloud/services/compute/instance.go +++ b/pkg/cloud/services/compute/instance.go @@ -24,13 +24,13 @@ import ( "strconv" "time" - "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/bootfromvolume" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/schedulerhints" - "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" - "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/bootfromvolume" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/keypairs" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/schedulerhints" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" @@ -425,7 +425,6 @@ func (s *Service) getOrCreateVolumeBuilder(eventObject runtime.Object, instanceS Description: description, Size: blockDevice.SizeGiB, ImageID: imageID, - Multiattach: false, AvailabilityZone: availabilityZone, VolumeType: volumeType, } diff --git a/pkg/cloud/services/compute/instance_test.go b/pkg/cloud/services/compute/instance_test.go index d868e47940..67ef8095aa 100644 --- a/pkg/cloud/services/compute/instance_test.go +++ b/pkg/cloud/services/compute/instance_test.go @@ -25,20 +25,20 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - common "github.com/gophercloud/gophercloud/openstack/common/extensions" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/attachinterfaces" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones" - "github.com/gophercloud/gophercloud/openstack/compute/v2/flavors" - "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes" + common "github.com/gophercloud/gophercloud/v2/openstack/common/extensions" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/attachinterfaces" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/availabilityzones" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" + "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct" gomegatypes "github.com/onsi/gomega/types" @@ -511,7 +511,6 @@ func TestService_ReconcileInstance(t *testing.T) { Description: fmt.Sprintf("Root volume for %s", openStackMachineName), Name: fmt.Sprintf("%s-root", openStackMachineName), ImageID: imageUUID, - Multiattach: false, }).Return(&volumes.Volume{ID: rootVolumeUUID}, nil) expectVolumePollSuccess(r.volume, rootVolumeUUID) @@ -557,7 +556,6 @@ func TestService_ReconcileInstance(t *testing.T) { Description: fmt.Sprintf("Root volume for %s", openStackMachineName), Name: fmt.Sprintf("%s-root", openStackMachineName), ImageID: imageUUID, - Multiattach: false, }).Return(&volumes.Volume{ID: rootVolumeUUID}, nil) expectVolumePollSuccess(r.volume, rootVolumeUUID) @@ -600,7 +598,6 @@ func TestService_ReconcileInstance(t *testing.T) { Description: fmt.Sprintf("Root volume for %s", openStackMachineName), Name: fmt.Sprintf("%s-root", openStackMachineName), ImageID: imageUUID, - Multiattach: false, }).Return(&volumes.Volume{ID: rootVolumeUUID}, nil) expectVolumePoll(r.volume, rootVolumeUUID, []string{"creating", "error"}) @@ -648,7 +645,6 @@ func TestService_ReconcileInstance(t *testing.T) { Description: fmt.Sprintf("Root volume for %s", openStackMachineName), Name: fmt.Sprintf("%s-root", openStackMachineName), ImageID: imageUUID, - Multiattach: false, }).Return(&volumes.Volume{ID: rootVolumeUUID}, nil) expectVolumePollSuccess(r.volume, rootVolumeUUID) @@ -659,7 +655,6 @@ func TestService_ReconcileInstance(t *testing.T) { AvailabilityZone: failureDomain, Description: fmt.Sprintf("Additional block device for %s", openStackMachineName), Name: fmt.Sprintf("%s-etcd", openStackMachineName), - Multiattach: false, VolumeType: "test-volume-type", }).Return(&volumes.Volume{ID: additionalBlockDeviceVolumeUUID}, nil) expectVolumePollSuccess(r.volume, additionalBlockDeviceVolumeUUID) @@ -734,7 +729,6 @@ func TestService_ReconcileInstance(t *testing.T) { AvailabilityZone: failureDomain, Description: fmt.Sprintf("Additional block device for %s", openStackMachineName), Name: fmt.Sprintf("%s-etcd", openStackMachineName), - Multiattach: false, VolumeType: "test-volume-type", }).Return(&volumes.Volume{ID: additionalBlockDeviceVolumeUUID}, nil) expectVolumePollSuccess(r.volume, additionalBlockDeviceVolumeUUID) @@ -802,7 +796,6 @@ func TestService_ReconcileInstance(t *testing.T) { AvailabilityZone: "test-alternate-az", Description: fmt.Sprintf("Additional block device for %s", openStackMachineName), Name: fmt.Sprintf("%s-etcd", openStackMachineName), - Multiattach: false, VolumeType: "test-volume-type", }).Return(&volumes.Volume{ID: additionalBlockDeviceVolumeUUID}, nil) expectVolumePollSuccess(r.volume, additionalBlockDeviceVolumeUUID) diff --git a/pkg/cloud/services/compute/referenced_resources_test.go b/pkg/cloud/services/compute/referenced_resources_test.go index 6a976325c4..a37e6ff581 100644 --- a/pkg/cloud/services/compute/referenced_resources_test.go +++ b/pkg/cloud/services/compute/referenced_resources_test.go @@ -22,8 +22,8 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" - "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/servergroups" + "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" diff --git a/pkg/cloud/services/compute/servergroup.go b/pkg/cloud/services/compute/servergroup.go index b084a99634..16aab9f422 100644 --- a/pkg/cloud/services/compute/servergroup.go +++ b/pkg/cloud/services/compute/servergroup.go @@ -19,7 +19,7 @@ package compute import ( "fmt" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/servergroups" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" ) diff --git a/pkg/cloud/services/compute/servergroup_test.go b/pkg/cloud/services/compute/servergroup_test.go index 572e3d78c6..876505f2a9 100644 --- a/pkg/cloud/services/compute/servergroup_test.go +++ b/pkg/cloud/services/compute/servergroup_test.go @@ -22,7 +22,7 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/servergroups" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock" diff --git a/pkg/cloud/services/loadbalancer/loadbalancer.go b/pkg/cloud/services/loadbalancer/loadbalancer.go index 6ed0f83c2a..75d4952c4a 100644 --- a/pkg/cloud/services/loadbalancer/loadbalancer.go +++ b/pkg/cloud/services/loadbalancer/loadbalancer.go @@ -22,10 +22,10 @@ import ( "reflect" "time" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/listeners" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/loadbalancers" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/monitors" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/pools" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/utils/net" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" diff --git a/pkg/cloud/services/loadbalancer/loadbalancer_test.go b/pkg/cloud/services/loadbalancer/loadbalancer_test.go index 4eb4737712..ffe1506862 100644 --- a/pkg/cloud/services/loadbalancer/loadbalancer_test.go +++ b/pkg/cloud/services/loadbalancer/loadbalancer_test.go @@ -21,12 +21,12 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/apiversions" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools" - "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/providers" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/apiversions" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/listeners" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/loadbalancers" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/monitors" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/pools" + "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/providers" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" diff --git a/pkg/cloud/services/networking/floatingip.go b/pkg/cloud/services/networking/floatingip.go index 8586ba6223..61468e8a54 100644 --- a/pkg/cloud/services/networking/floatingip.go +++ b/pkg/cloud/services/networking/floatingip.go @@ -20,8 +20,8 @@ import ( "fmt" "time" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/cloud/services/networking/floatingip_test.go b/pkg/cloud/services/networking/floatingip_test.go index 06c1fdc005..5c2770a5e1 100644 --- a/pkg/cloud/services/networking/floatingip_test.go +++ b/pkg/cloud/services/networking/floatingip_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" diff --git a/pkg/cloud/services/networking/network.go b/pkg/cloud/services/networking/network.go index 5eaf691471..a4f0e59471 100644 --- a/pkg/cloud/services/networking/network.go +++ b/pkg/cloud/services/networking/network.go @@ -19,11 +19,11 @@ package networking import ( "fmt" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/external" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" "sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics" diff --git a/pkg/cloud/services/networking/network_test.go b/pkg/cloud/services/networking/network_test.go index 512cc53146..3a494a98c2 100644 --- a/pkg/cloud/services/networking/network_test.go +++ b/pkg/cloud/services/networking/network_test.go @@ -22,10 +22,10 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/external" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/external" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" . "github.com/onsi/gomega" "k8s.io/utils/pointer" diff --git a/pkg/cloud/services/networking/port.go b/pkg/cloud/services/networking/port.go index 84b9bfc618..24c60eb9d9 100644 --- a/pkg/cloud/services/networking/port.go +++ b/pkg/cloud/services/networking/port.go @@ -22,9 +22,9 @@ import ( "strings" "time" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/portsbinding" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/portsecurity" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/portsbinding" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/portsecurity" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/cloud/services/networking/port_test.go b/pkg/cloud/services/networking/port_test.go index a86837778e..fc22c3bced 100644 --- a/pkg/cloud/services/networking/port_test.go +++ b/pkg/cloud/services/networking/port_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/portsbinding" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/portsecurity" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/portsbinding" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/portsecurity" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" diff --git a/pkg/cloud/services/networking/router.go b/pkg/cloud/services/networking/router.go index 021617c060..073cbd4a11 100644 --- a/pkg/cloud/services/networking/router.go +++ b/pkg/cloud/services/networking/router.go @@ -19,10 +19,10 @@ package networking import ( "fmt" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" diff --git a/pkg/cloud/services/networking/securitygroups.go b/pkg/cloud/services/networking/securitygroups.go index e2a5617de6..2933bafed4 100644 --- a/pkg/cloud/services/networking/securitygroups.go +++ b/pkg/cloud/services/networking/securitygroups.go @@ -19,9 +19,9 @@ package networking import ( "fmt" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/rules" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" diff --git a/pkg/cloud/services/networking/service.go b/pkg/cloud/services/networking/service.go index b0a9b8da17..3d5ee1e475 100644 --- a/pkg/cloud/services/networking/service.go +++ b/pkg/cloud/services/networking/service.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/attributestags" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/cluster-api-provider-openstack/pkg/clients" diff --git a/pkg/cloud/services/networking/trunk.go b/pkg/cloud/services/networking/trunk.go index 6743478ffd..45d1e8ba58 100644 --- a/pkg/cloud/services/networking/trunk.go +++ b/pkg/cloud/services/networking/trunk.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/cloud/services/networking/trunk_test.go b/pkg/cloud/services/networking/trunk_test.go index 24c6bfb719..f9eee92d9c 100644 --- a/pkg/cloud/services/networking/trunk_test.go +++ b/pkg/cloud/services/networking/trunk_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha8" diff --git a/pkg/scope/mock.go b/pkg/scope/mock.go index 7dd2364b92..434fdc33e6 100644 --- a/pkg/scope/mock.go +++ b/pkg/scope/mock.go @@ -22,7 +22,7 @@ import ( "github.com/go-logr/logr" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens" + "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1" diff --git a/pkg/scope/provider.go b/pkg/scope/provider.go index e7a060d3f4..63e8e90274 100644 --- a/pkg/scope/provider.go +++ b/pkg/scope/provider.go @@ -25,11 +25,12 @@ import ( "time" "github.com/go-logr/logr" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens" - osclient "github.com/gophercloud/utils/client" - "github.com/gophercloud/utils/openstack/clientconfig" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack" + "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens" + osclient "github.com/gophercloud/utils/v2/client" + osclient "github.com/gophercloud/utils/v2/client" + "github.com/gophercloud/utils/v2/openstack/clientconfig" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/cache" diff --git a/pkg/scope/scope.go b/pkg/scope/scope.go index 5c8f24b968..737abeca09 100644 --- a/pkg/scope/scope.go +++ b/pkg/scope/scope.go @@ -20,7 +20,7 @@ import ( "context" "github.com/go-logr/logr" - "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens" + "github.com/gophercloud/gophercloud/v2/openstack/identity/v3/tokens" "k8s.io/apimachinery/pkg/util/cache" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/utils/errors/errors.go b/pkg/utils/errors/errors.go index a2ff9d67af..79917c4d99 100644 --- a/pkg/utils/errors/errors.go +++ b/pkg/utils/errors/errors.go @@ -20,7 +20,7 @@ import ( "errors" "net/http" - "github.com/gophercloud/gophercloud" + "github.com/gophercloud/gophercloud/v2" ) func IsRetryable(err error) bool { @@ -36,7 +36,7 @@ func IsNotFound(err error) bool { // Gophercloud is not consistent in how it returns 404 errors. Sometimes // it returns a pointer to the error, sometimes it returns the error // directly. - // Some discussion here: https://github.com/gophercloud/gophercloud/issues/2279 + // Some discussion here: https://github.com/gophercloud/gophercloud/v2/issues/2279 var errDefault404 gophercloud.ErrDefault404 var pErrDefault404 *gophercloud.ErrDefault404 var errNotFound gophercloud.ErrResourceNotFound diff --git a/test/e2e/shared/openstack.go b/test/e2e/shared/openstack.go index 4d46837775..6a6cc367d5 100644 --- a/test/e2e/shared/openstack.go +++ b/test/e2e/shared/openstack.go @@ -31,20 +31,20 @@ import ( "strings" "github.com/go-logr/logr" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack" - "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones" - "github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs" - "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" - "github.com/gophercloud/utils/openstack/clientconfig" + "github.com/gophercloud/gophercloud/v2" + "github.com/gophercloud/gophercloud/v2/openstack" + "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/availabilityzones" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/keypairs" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" + "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" + "github.com/gophercloud/utils/v2/openstack/clientconfig" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/ini.v1" diff --git a/test/e2e/suites/e2e/e2e_test.go b/test/e2e/suites/e2e/e2e_test.go index 2490d848ac..672c1b4894 100644 --- a/test/e2e/suites/e2e/e2e_test.go +++ b/test/e2e/suites/e2e/e2e_test.go @@ -28,14 +28,14 @@ import ( "strings" "time" - "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups" - "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/networks" - "github.com/gophercloud/gophercloud/openstack/networking/v2/ports" - "github.com/gophercloud/gophercloud/openstack/networking/v2/subnets" + "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/routers" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gstruct"