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/v1beta1/filter_convert.go b/api/v1beta1/filter_convert.go index 23f7f3c348..9c102ffc32 100644 --- a/api/v1beta1/filter_convert.go +++ b/api/v1beta1/filter_convert.go @@ -19,11 +19,11 @@ package v1beta1 import ( "strings" - "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.go b/controllers/openstackcluster_controller.go index 944155f100..cf052720e5 100644 --- a/controllers/openstackcluster_controller.go +++ b/controllers/openstackcluster_controller.go @@ -23,8 +23,8 @@ import ( "reflect" "time" - "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" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" kerrors "k8s.io/apimachinery/pkg/util/errors" diff --git a/controllers/openstackcluster_controller_test.go b/controllers/openstackcluster_controller_test.go index 971d0308d2..f37646c115 100644 --- a/controllers/openstackcluster_controller_test.go +++ b/controllers/openstackcluster_controller_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack/compute/v2/servers" - "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/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/servers" + "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/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 fbcdeb2b63..64bb2dddc8 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 565999d219..f816e7e47c 100644 --- a/go.mod +++ b/go.mod @@ -8,14 +8,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.2 + github.com/gophercloud/utils/v2 v2.0.0-20240228132853-8515e998ecab 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.20.0 golang.org/x/text v0.14.0 gopkg.in/ini.v1 v1.67.0 k8s.io/api v0.28.4 @@ -136,11 +136,11 @@ require ( go.uber.org/zap v1.25.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/mod v0.13.0 // indirect - golang.org/x/net v0.18.0 // indirect + golang.org/x/net v0.21.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..f54bdbf544 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.2 h1:JWv6L7eg3+aIS57n11YlVvtn1pVCKpVlMo24ANj/OVc= +github.com/gophercloud/gophercloud/v2 v2.0.0-beta.2/go.mod h1:Sy5GHwY4iazyaRf94rzL/VxJToVWn8WnIH+1cXqoAks= +github.com/gophercloud/utils/v2 v2.0.0-20240228132853-8515e998ecab h1:aqG/2izI8msKSsQHjctUK5IK7NVnHZf4viFzgdPQ95I= +github.com/gophercloud/utils/v2 v2.0.0-20240228132853-8515e998ecab/go.mod h1:9FxtPO76ic4mm7S2//+EYOQt3YzvjIHyOw5NkDMqjso= 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.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg= +golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= 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= @@ -567,8 +565,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -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..68418e5912 100644 --- a/pkg/clients/compute.go +++ b/pkg/clients/compute.go @@ -17,17 +17,18 @@ limitations under the License. package clients import ( + "context" "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" ) @@ -83,7 +84,7 @@ func NewComputeClient(providerClient *gophercloud.ProviderClient, providerClient func (c computeClient) ListAvailabilityZones() ([]availabilityzones.AvailabilityZone, error) { mc := metrics.NewMetricPrometheusContext("availability_zone", "list") - allPages, err := availabilityzones.List(c.client).AllPages() + allPages, err := availabilityzones.List(c.client).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -92,18 +93,18 @@ func (c computeClient) ListAvailabilityZones() ([]availabilityzones.Availability func (c computeClient) GetFlavorFromName(flavor string) (*flavors.Flavor, error) { mc := metrics.NewMetricPrometheusContext("flavor", "get") - flavorID, err := uflavors.IDFromName(c.client, flavor) + flavorID, err := uflavors.IDFromName(context.TODO(), c.client, flavor) if mc.ObserveRequest(err) != nil { return nil, err } - f, err := flavors.Get(c.client, flavorID).Extract() + f, err := flavors.Get(context.TODO(), c.client, flavorID).Extract() return f, mc.ObserveRequest(err) } func (c computeClient) CreateServer(createOpts servers.CreateOptsBuilder) (*ServerExt, error) { var server ServerExt mc := metrics.NewMetricPrometheusContext("server", "create") - err := servers.Create(c.client, createOpts).ExtractInto(&server) + err := servers.Create(context.TODO(), c.client, createOpts).ExtractInto(&server) if mc.ObserveRequest(err) != nil { return nil, err } @@ -112,14 +113,14 @@ func (c computeClient) CreateServer(createOpts servers.CreateOptsBuilder) (*Serv func (c computeClient) DeleteServer(serverID string) error { mc := metrics.NewMetricPrometheusContext("server", "delete") - err := servers.Delete(c.client, serverID).ExtractErr() + err := servers.Delete(context.TODO(), c.client, serverID).ExtractErr() return mc.ObserveRequestIgnoreNotFound(err) } func (c computeClient) GetServer(serverID string) (*ServerExt, error) { var server ServerExt mc := metrics.NewMetricPrometheusContext("server", "get") - err := servers.Get(c.client, serverID).ExtractInto(&server) + err := servers.Get(context.TODO(), c.client, serverID).ExtractInto(&server) if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -129,7 +130,7 @@ func (c computeClient) GetServer(serverID string) (*ServerExt, error) { func (c computeClient) ListServers(listOpts servers.ListOptsBuilder) ([]ServerExt, error) { var serverList []ServerExt mc := metrics.NewMetricPrometheusContext("server", "list") - allPages, err := servers.List(c.client, listOpts).AllPages() + allPages, err := servers.List(c.client, listOpts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -139,7 +140,7 @@ func (c computeClient) ListServers(listOpts servers.ListOptsBuilder) ([]ServerEx func (c computeClient) ListAttachedInterfaces(serverID string) ([]attachinterfaces.Interface, error) { mc := metrics.NewMetricPrometheusContext("server_os_interface", "list") - interfaces, err := attachinterfaces.List(c.client, serverID).AllPages() + interfaces, err := attachinterfaces.List(c.client, serverID).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -148,14 +149,14 @@ func (c computeClient) ListAttachedInterfaces(serverID string) ([]attachinterfac func (c computeClient) DeleteAttachedInterface(serverID, portID string) error { mc := metrics.NewMetricPrometheusContext("server_os_interface", "delete") - err := attachinterfaces.Delete(c.client, serverID, portID).ExtractErr() + err := attachinterfaces.Delete(context.TODO(), c.client, serverID, portID).ExtractErr() return mc.ObserveRequestIgnoreNotFoundorConflict(err) } func (c computeClient) ListServerGroups() ([]servergroups.ServerGroup, error) { mc := metrics.NewMetricPrometheusContext("server_group", "list") opts := servergroups.ListOpts{} - allPages, err := servergroups.List(c.client, opts).AllPages() + allPages, err := servergroups.List(c.client, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } diff --git a/pkg/clients/image.go b/pkg/clients/image.go index 329cb951d6..9387990394 100644 --- a/pkg/clients/image.go +++ b/pkg/clients/image.go @@ -17,12 +17,13 @@ limitations under the License. package clients import ( + "context" "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" ) @@ -48,7 +49,7 @@ func NewImageClient(providerClient *gophercloud.ProviderClient, providerClientOp func (c imageClient) ListImages(listOpts images.ListOptsBuilder) ([]images.Image, error) { mc := metrics.NewMetricPrometheusContext("image", "list") - pages, err := images.List(c.client, listOpts).AllPages() + pages, err := images.List(c.client, listOpts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } diff --git a/pkg/clients/loadbalancer.go b/pkg/clients/loadbalancer.go index 7ec2b2c673..2ee075345b 100644 --- a/pkg/clients/loadbalancer.go +++ b/pkg/clients/loadbalancer.go @@ -17,17 +17,18 @@ limitations under the License. package clients import ( + "context" "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" @@ -76,7 +77,7 @@ func NewLbClient(providerClient *gophercloud.ProviderClient, providerClientOpts func (l lbClient) CreateLoadBalancer(opts loadbalancers.CreateOptsBuilder) (*loadbalancers.LoadBalancer, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer", "create") - lb, err := loadbalancers.Create(l.serviceClient, opts).Extract() + lb, err := loadbalancers.Create(context.TODO(), l.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -85,7 +86,7 @@ func (l lbClient) CreateLoadBalancer(opts loadbalancers.CreateOptsBuilder) (*loa func (l lbClient) ListLoadBalancers(opts loadbalancers.ListOptsBuilder) ([]loadbalancers.LoadBalancer, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer", "list") - allPages, err := loadbalancers.List(l.serviceClient, opts).AllPages() + allPages, err := loadbalancers.List(l.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -94,7 +95,7 @@ func (l lbClient) ListLoadBalancers(opts loadbalancers.ListOptsBuilder) ([]loadb func (l lbClient) GetLoadBalancer(id string) (*loadbalancers.LoadBalancer, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer", "get") - lb, err := loadbalancers.Get(l.serviceClient, id).Extract() + lb, err := loadbalancers.Get(context.TODO(), l.serviceClient, id).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -103,7 +104,7 @@ func (l lbClient) GetLoadBalancer(id string) (*loadbalancers.LoadBalancer, error func (l lbClient) DeleteLoadBalancer(id string, opts loadbalancers.DeleteOptsBuilder) error { mc := metrics.NewMetricPrometheusContext("loadbalancer", "delete") - err := loadbalancers.Delete(l.serviceClient, id, opts).ExtractErr() + err := loadbalancers.Delete(context.TODO(), l.serviceClient, id, opts).ExtractErr() if mc.ObserveRequestIgnoreNotFound(err) != nil && !capoerrors.IsNotFound(err) { return err } @@ -112,7 +113,7 @@ func (l lbClient) DeleteLoadBalancer(id string, opts loadbalancers.DeleteOptsBui func (l lbClient) CreateListener(opts listeners.CreateOptsBuilder) (*listeners.Listener, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_listener", "create") - listener, err := listeners.Create(l.serviceClient, opts).Extract() + listener, err := listeners.Create(context.TODO(), l.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -121,7 +122,7 @@ func (l lbClient) CreateListener(opts listeners.CreateOptsBuilder) (*listeners.L func (l lbClient) UpdateListener(id string, opts listeners.UpdateOpts) (*listeners.Listener, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_listener", "update") - listener, err := listeners.Update(l.serviceClient, id, opts).Extract() + listener, err := listeners.Update(context.TODO(), l.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -130,7 +131,7 @@ func (l lbClient) UpdateListener(id string, opts listeners.UpdateOpts) (*listene func (l lbClient) ListListeners(opts listeners.ListOptsBuilder) ([]listeners.Listener, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_listener", "list") - allPages, err := listeners.List(l.serviceClient, opts).AllPages() + allPages, err := listeners.List(l.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -139,7 +140,7 @@ func (l lbClient) ListListeners(opts listeners.ListOptsBuilder) ([]listeners.Lis func (l lbClient) GetListener(id string) (*listeners.Listener, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_listener", "get") - listener, err := listeners.Get(l.serviceClient, id).Extract() + listener, err := listeners.Get(context.TODO(), l.serviceClient, id).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -148,7 +149,7 @@ func (l lbClient) GetListener(id string) (*listeners.Listener, error) { func (l lbClient) DeleteListener(id string) error { mc := metrics.NewMetricPrometheusContext("loadbalancer_listener", "delete") - err := listeners.Delete(l.serviceClient, id).ExtractErr() + err := listeners.Delete(context.TODO(), l.serviceClient, id).ExtractErr() if mc.ObserveRequestIgnoreNotFound(err) != nil && !capoerrors.IsNotFound(err) { return fmt.Errorf("error deleting lbaas listener %s: %v", id, err) } @@ -157,7 +158,7 @@ func (l lbClient) DeleteListener(id string) error { func (l lbClient) CreatePool(opts pools.CreateOptsBuilder) (*pools.Pool, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_pool", "create") - pool, err := pools.Create(l.serviceClient, opts).Extract() + pool, err := pools.Create(context.TODO(), l.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -166,7 +167,7 @@ func (l lbClient) CreatePool(opts pools.CreateOptsBuilder) (*pools.Pool, error) func (l lbClient) ListPools(opts pools.ListOptsBuilder) ([]pools.Pool, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_pool", "list") - allPages, err := pools.List(l.serviceClient, opts).AllPages() + allPages, err := pools.List(l.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -175,7 +176,7 @@ func (l lbClient) ListPools(opts pools.ListOptsBuilder) ([]pools.Pool, error) { func (l lbClient) GetPool(id string) (*pools.Pool, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_pool", "get") - pool, err := pools.Get(l.serviceClient, id).Extract() + pool, err := pools.Get(context.TODO(), l.serviceClient, id).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -184,7 +185,7 @@ func (l lbClient) GetPool(id string) (*pools.Pool, error) { func (l lbClient) DeletePool(id string) error { mc := metrics.NewMetricPrometheusContext("loadbalancer_pool", "delete") - err := pools.Delete(l.serviceClient, id).ExtractErr() + err := pools.Delete(context.TODO(), l.serviceClient, id).ExtractErr() if mc.ObserveRequestIgnoreNotFound(err) != nil && !capoerrors.IsNotFound(err) { return fmt.Errorf("error deleting lbaas pool %s: %v", id, err) } @@ -193,7 +194,7 @@ func (l lbClient) DeletePool(id string) error { func (l lbClient) CreatePoolMember(poolID string, lbMemberOpts pools.CreateMemberOptsBuilder) (*pools.Member, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_member", "create") - member, err := pools.CreateMember(l.serviceClient, poolID, lbMemberOpts).Extract() + member, err := pools.CreateMember(context.TODO(), l.serviceClient, poolID, lbMemberOpts).Extract() if mc.ObserveRequest(err) != nil { return nil, fmt.Errorf("error create lbmember: %s", err) } @@ -202,7 +203,7 @@ func (l lbClient) CreatePoolMember(poolID string, lbMemberOpts pools.CreateMembe func (l lbClient) ListPoolMember(poolID string, opts pools.ListMembersOptsBuilder) ([]pools.Member, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_pool", "list") - allPages, err := pools.ListMembers(l.serviceClient, poolID, opts).AllPages() + allPages, err := pools.ListMembers(l.serviceClient, poolID, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -211,7 +212,7 @@ func (l lbClient) ListPoolMember(poolID string, opts pools.ListMembersOptsBuilde func (l lbClient) DeletePoolMember(poolID string, lbMemberID string) error { mc := metrics.NewMetricPrometheusContext("loadbalancer_member", "delete") - err := pools.DeleteMember(l.serviceClient, poolID, lbMemberID).ExtractErr() + err := pools.DeleteMember(context.TODO(), l.serviceClient, poolID, lbMemberID).ExtractErr() if mc.ObserveRequest(err) != nil { return fmt.Errorf("error deleting lbmember: %s", err) } @@ -220,7 +221,7 @@ func (l lbClient) DeletePoolMember(poolID string, lbMemberID string) error { func (l lbClient) CreateMonitor(opts monitors.CreateOptsBuilder) (*monitors.Monitor, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_healthmonitor", "create") - monitor, err := monitors.Create(l.serviceClient, opts).Extract() + monitor, err := monitors.Create(context.TODO(), l.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -229,7 +230,7 @@ func (l lbClient) CreateMonitor(opts monitors.CreateOptsBuilder) (*monitors.Moni func (l lbClient) ListMonitors(opts monitors.ListOptsBuilder) ([]monitors.Monitor, error) { mc := metrics.NewMetricPrometheusContext("loadbalancer_healthmonitor", "list") - allPages, err := monitors.List(l.serviceClient, opts).AllPages() + allPages, err := monitors.List(l.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -238,7 +239,7 @@ func (l lbClient) ListMonitors(opts monitors.ListOptsBuilder) ([]monitors.Monito func (l lbClient) DeleteMonitor(id string) error { mc := metrics.NewMetricPrometheusContext("loadbalancer_healthmonitor", "delete") - err := monitors.Delete(l.serviceClient, id).ExtractErr() + err := monitors.Delete(context.TODO(), l.serviceClient, id).ExtractErr() if mc.ObserveRequestIgnoreNotFound(err) != nil && !capoerrors.IsNotFound(err) { return fmt.Errorf("error deleting lbaas monitor %s: %v", id, err) } @@ -246,7 +247,7 @@ func (l lbClient) DeleteMonitor(id string) error { } func (l lbClient) ListLoadBalancerProviders() ([]providers.Provider, error) { - allPages, err := providers.List(l.serviceClient, providers.ListOpts{}).AllPages() + allPages, err := providers.List(l.serviceClient, providers.ListOpts{}).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("listing providers: %v", err) } @@ -259,7 +260,7 @@ func (l lbClient) ListLoadBalancerProviders() ([]providers.Provider, error) { func (l lbClient) ListOctaviaVersions() ([]apiversions.APIVersion, error) { mc := metrics.NewMetricPrometheusContext("version", "list") - allPages, err := apiversions.List(l.serviceClient).AllPages() + allPages, err := apiversions.List(l.serviceClient).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } 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..242fee3ccd 100644 --- a/pkg/clients/networking.go +++ b/pkg/clients/networking.go @@ -17,21 +17,22 @@ limitations under the License. package clients import ( + "context" "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" ) @@ -108,7 +109,7 @@ func NewNetworkClient(providerClient *gophercloud.ProviderClient, providerClient func (c networkClient) AddRouterInterface(id string, opts routers.AddInterfaceOptsBuilder) (*routers.InterfaceInfo, error) { mc := metrics.NewMetricPrometheusContext("server_os_interface", "create") - interfaceInfo, err := routers.AddInterface(c.serviceClient, id, opts).Extract() + interfaceInfo, err := routers.AddInterface(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -117,7 +118,7 @@ func (c networkClient) AddRouterInterface(id string, opts routers.AddInterfaceOp func (c networkClient) RemoveRouterInterface(id string, opts routers.RemoveInterfaceOptsBuilder) (*routers.InterfaceInfo, error) { mc := metrics.NewMetricPrometheusContext("server_os_interface", "delete") - interfaceInfo, err := routers.RemoveInterface(c.serviceClient, id, opts).Extract() + interfaceInfo, err := routers.RemoveInterface(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -126,7 +127,7 @@ func (c networkClient) RemoveRouterInterface(id string, opts routers.RemoveInter func (c networkClient) ReplaceAllAttributesTags(resourceType string, resourceID string, opts attributestags.ReplaceAllOptsBuilder) ([]string, error) { mc := metrics.NewMetricPrometheusContext("attributes_tags", "replace_all") - tags, err := attributestags.ReplaceAll(c.serviceClient, resourceType, resourceID, opts).Extract() + tags, err := attributestags.ReplaceAll(context.TODO(), c.serviceClient, resourceType, resourceID, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -135,7 +136,7 @@ func (c networkClient) ReplaceAllAttributesTags(resourceType string, resourceID func (c networkClient) ListRouter(opts routers.ListOpts) ([]routers.Router, error) { mc := metrics.NewMetricPrometheusContext("router", "list") - allPages, err := routers.List(c.serviceClient, opts).AllPages() + allPages, err := routers.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -144,7 +145,7 @@ func (c networkClient) ListRouter(opts routers.ListOpts) ([]routers.Router, erro func (c networkClient) ListFloatingIP(opts floatingips.ListOptsBuilder) ([]floatingips.FloatingIP, error) { mc := metrics.NewMetricPrometheusContext("floating_ip", "list") - allPages, err := floatingips.List(c.serviceClient, opts).AllPages() + allPages, err := floatingips.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -153,7 +154,7 @@ func (c networkClient) ListFloatingIP(opts floatingips.ListOptsBuilder) ([]float func (c networkClient) CreateFloatingIP(opts floatingips.CreateOptsBuilder) (*floatingips.FloatingIP, error) { mc := metrics.NewMetricPrometheusContext("floating_ip", "create") - fip, err := floatingips.Create(c.serviceClient, opts).Extract() + fip, err := floatingips.Create(context.TODO(), c.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -162,12 +163,12 @@ func (c networkClient) CreateFloatingIP(opts floatingips.CreateOptsBuilder) (*fl func (c networkClient) DeleteFloatingIP(id string) error { mc := metrics.NewMetricPrometheusContext("floating_ip", "delete") - return mc.ObserveRequestIgnoreNotFound(floatingips.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(floatingips.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) GetFloatingIP(id string) (*floatingips.FloatingIP, error) { mc := metrics.NewMetricPrometheusContext("floating_ip", "list") - fip, err := floatingips.Get(c.serviceClient, id).Extract() + fip, err := floatingips.Get(context.TODO(), c.serviceClient, id).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -176,7 +177,7 @@ func (c networkClient) GetFloatingIP(id string) (*floatingips.FloatingIP, error) func (c networkClient) UpdateFloatingIP(id string, opts floatingips.UpdateOptsBuilder) (*floatingips.FloatingIP, error) { mc := metrics.NewMetricPrometheusContext("floating_ip", "update") - fip, err := floatingips.Update(c.serviceClient, id, opts).Extract() + fip, err := floatingips.Update(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -185,7 +186,7 @@ func (c networkClient) UpdateFloatingIP(id string, opts floatingips.UpdateOptsBu func (c networkClient) ListPort(opts ports.ListOptsBuilder) ([]ports.Port, error) { mc := metrics.NewMetricPrometheusContext("port", "list") - allPages, err := ports.List(c.serviceClient, opts).AllPages() + allPages, err := ports.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -194,7 +195,7 @@ func (c networkClient) ListPort(opts ports.ListOptsBuilder) ([]ports.Port, error func (c networkClient) CreatePort(opts ports.CreateOptsBuilder) (*ports.Port, error) { mc := metrics.NewMetricPrometheusContext("port", "create") - port, err := ports.Create(c.serviceClient, opts).Extract() + port, err := ports.Create(context.TODO(), c.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -203,12 +204,12 @@ func (c networkClient) CreatePort(opts ports.CreateOptsBuilder) (*ports.Port, er func (c networkClient) DeletePort(id string) error { mc := metrics.NewMetricPrometheusContext("port", "delete") - return mc.ObserveRequestIgnoreNotFound(ports.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(ports.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) GetPort(id string) (*ports.Port, error) { mc := metrics.NewMetricPrometheusContext("port", "get") - port, err := ports.Get(c.serviceClient, id).Extract() + port, err := ports.Get(context.TODO(), c.serviceClient, id).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -217,7 +218,7 @@ func (c networkClient) GetPort(id string) (*ports.Port, error) { func (c networkClient) UpdatePort(id string, opts ports.UpdateOptsBuilder) (*ports.Port, error) { mc := metrics.NewMetricPrometheusContext("port", "update") - port, err := ports.Update(c.serviceClient, id, opts).Extract() + port, err := ports.Update(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -226,7 +227,7 @@ func (c networkClient) UpdatePort(id string, opts ports.UpdateOptsBuilder) (*por func (c networkClient) CreateTrunk(opts trunks.CreateOptsBuilder) (*trunks.Trunk, error) { mc := metrics.NewMetricPrometheusContext("trunk", "create") - trunk, err := trunks.Create(c.serviceClient, opts).Extract() + trunk, err := trunks.Create(context.TODO(), c.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -235,12 +236,12 @@ func (c networkClient) CreateTrunk(opts trunks.CreateOptsBuilder) (*trunks.Trunk func (c networkClient) DeleteTrunk(id string) error { mc := metrics.NewMetricPrometheusContext("trunk", "delete") - return mc.ObserveRequestIgnoreNotFound(trunks.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(trunks.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) ListTrunk(opts trunks.ListOptsBuilder) ([]trunks.Trunk, error) { mc := metrics.NewMetricPrometheusContext("trunk", "list") - allPages, err := trunks.List(c.serviceClient, opts).AllPages() + allPages, err := trunks.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -249,7 +250,7 @@ func (c networkClient) ListTrunk(opts trunks.ListOptsBuilder) ([]trunks.Trunk, e func (c networkClient) CreateRouter(opts routers.CreateOptsBuilder) (*routers.Router, error) { mc := metrics.NewMetricPrometheusContext("router", "create") - router, err := routers.Create(c.serviceClient, opts).Extract() + router, err := routers.Create(context.TODO(), c.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -258,12 +259,12 @@ func (c networkClient) CreateRouter(opts routers.CreateOptsBuilder) (*routers.Ro func (c networkClient) DeleteRouter(id string) error { mc := metrics.NewMetricPrometheusContext("router", "delete") - return mc.ObserveRequestIgnoreNotFound(routers.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(routers.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) GetRouter(id string) (*routers.Router, error) { mc := metrics.NewMetricPrometheusContext("router", "get") - router, err := routers.Get(c.serviceClient, id).Extract() + router, err := routers.Get(context.TODO(), c.serviceClient, id).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -272,7 +273,7 @@ func (c networkClient) GetRouter(id string) (*routers.Router, error) { func (c networkClient) UpdateRouter(id string, opts routers.UpdateOptsBuilder) (*routers.Router, error) { mc := metrics.NewMetricPrometheusContext("router", "update") - router, err := routers.Update(c.serviceClient, id, opts).Extract() + router, err := routers.Update(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -281,7 +282,7 @@ func (c networkClient) UpdateRouter(id string, opts routers.UpdateOptsBuilder) ( func (c networkClient) ListSecGroup(opts groups.ListOpts) ([]groups.SecGroup, error) { mc := metrics.NewMetricPrometheusContext("group", "list") - allPages, err := groups.List(c.serviceClient, opts).AllPages() + allPages, err := groups.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -290,7 +291,7 @@ func (c networkClient) ListSecGroup(opts groups.ListOpts) ([]groups.SecGroup, er func (c networkClient) CreateSecGroup(opts groups.CreateOptsBuilder) (*groups.SecGroup, error) { mc := metrics.NewMetricPrometheusContext("security_group", "create") - group, err := groups.Create(c.serviceClient, opts).Extract() + group, err := groups.Create(context.TODO(), c.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -299,12 +300,12 @@ func (c networkClient) CreateSecGroup(opts groups.CreateOptsBuilder) (*groups.Se func (c networkClient) DeleteSecGroup(id string) error { mc := metrics.NewMetricPrometheusContext("security_group", "delete") - return mc.ObserveRequestIgnoreNotFound(groups.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(groups.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) GetSecGroup(id string) (*groups.SecGroup, error) { mc := metrics.NewMetricPrometheusContext("security_group", "get") - group, err := groups.Get(c.serviceClient, id).Extract() + group, err := groups.Get(context.TODO(), c.serviceClient, id).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -313,7 +314,7 @@ func (c networkClient) GetSecGroup(id string) (*groups.SecGroup, error) { func (c networkClient) UpdateSecGroup(id string, opts groups.UpdateOptsBuilder) (*groups.SecGroup, error) { mc := metrics.NewMetricPrometheusContext("security_group", "update") - group, err := groups.Update(c.serviceClient, id, opts).Extract() + group, err := groups.Update(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -322,7 +323,7 @@ func (c networkClient) UpdateSecGroup(id string, opts groups.UpdateOptsBuilder) func (c networkClient) ListSecGroupRule(opts rules.ListOpts) ([]rules.SecGroupRule, error) { mc := metrics.NewMetricPrometheusContext("security_group_rule", "list") - allPages, err := rules.List(c.serviceClient, opts).AllPages() + allPages, err := rules.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -331,7 +332,7 @@ func (c networkClient) ListSecGroupRule(opts rules.ListOpts) ([]rules.SecGroupRu func (c networkClient) CreateSecGroupRule(opts rules.CreateOptsBuilder) (*rules.SecGroupRule, error) { mc := metrics.NewMetricPrometheusContext("security_group_rule", "create") - rule, err := rules.Create(c.serviceClient, opts).Extract() + rule, err := rules.Create(context.TODO(), c.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -340,12 +341,12 @@ func (c networkClient) CreateSecGroupRule(opts rules.CreateOptsBuilder) (*rules. func (c networkClient) DeleteSecGroupRule(id string) error { mc := metrics.NewMetricPrometheusContext("security_group_rule", "delete") - return mc.ObserveRequestIgnoreNotFound(rules.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(rules.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) GetSecGroupRule(id string) (*rules.SecGroupRule, error) { mc := metrics.NewMetricPrometheusContext("security_group_rule", "get") - rule, err := rules.Get(c.serviceClient, id).Extract() + rule, err := rules.Get(context.TODO(), c.serviceClient, id).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -354,7 +355,7 @@ func (c networkClient) GetSecGroupRule(id string) (*rules.SecGroupRule, error) { func (c networkClient) ListNetwork(opts networks.ListOptsBuilder) ([]networks.Network, error) { mc := metrics.NewMetricPrometheusContext("network", "list") - allPages, err := networks.List(c.serviceClient, opts).AllPages() + allPages, err := networks.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -363,7 +364,7 @@ func (c networkClient) ListNetwork(opts networks.ListOptsBuilder) ([]networks.Ne func (c networkClient) CreateNetwork(opts networks.CreateOptsBuilder) (*networks.Network, error) { mc := metrics.NewMetricPrometheusContext("network", "create") - net, err := networks.Create(c.serviceClient, opts).Extract() + net, err := networks.Create(context.TODO(), c.serviceClient, opts).Extract() if (mc.ObserveRequest(err)) != nil { return nil, err } @@ -372,12 +373,12 @@ func (c networkClient) CreateNetwork(opts networks.CreateOptsBuilder) (*networks func (c networkClient) DeleteNetwork(id string) error { mc := metrics.NewMetricPrometheusContext("network", "delete") - return mc.ObserveRequestIgnoreNotFound(networks.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(networks.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) GetNetwork(id string) (*networks.Network, error) { mc := metrics.NewMetricPrometheusContext("network", "get") - net, err := networks.Get(c.serviceClient, id).Extract() + net, err := networks.Get(context.TODO(), c.serviceClient, id).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -386,7 +387,7 @@ func (c networkClient) GetNetwork(id string) (*networks.Network, error) { func (c networkClient) UpdateNetwork(id string, opts networks.UpdateOptsBuilder) (*networks.Network, error) { mc := metrics.NewMetricPrometheusContext("network", "update") - net, err := networks.Update(c.serviceClient, id, opts).Extract() + net, err := networks.Update(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -395,7 +396,7 @@ func (c networkClient) UpdateNetwork(id string, opts networks.UpdateOptsBuilder) func (c networkClient) ListSubnet(opts subnets.ListOptsBuilder) ([]subnets.Subnet, error) { mc := metrics.NewMetricPrometheusContext("subnet", "list") - allPages, err := subnets.List(c.serviceClient, opts).AllPages() + allPages, err := subnets.List(c.serviceClient, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -404,7 +405,7 @@ func (c networkClient) ListSubnet(opts subnets.ListOptsBuilder) ([]subnets.Subne func (c networkClient) CreateSubnet(opts subnets.CreateOptsBuilder) (*subnets.Subnet, error) { mc := metrics.NewMetricPrometheusContext("subnet", "create") - subnet, err := subnets.Create(c.serviceClient, opts).Extract() + subnet, err := subnets.Create(context.TODO(), c.serviceClient, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -413,12 +414,12 @@ func (c networkClient) CreateSubnet(opts subnets.CreateOptsBuilder) (*subnets.Su func (c networkClient) DeleteSubnet(id string) error { mc := metrics.NewMetricPrometheusContext("subnet", "delete") - return mc.ObserveRequestIgnoreNotFound(subnets.Delete(c.serviceClient, id).ExtractErr()) + return mc.ObserveRequestIgnoreNotFound(subnets.Delete(context.TODO(), c.serviceClient, id).ExtractErr()) } func (c networkClient) GetSubnet(id string) (*subnets.Subnet, error) { mc := metrics.NewMetricPrometheusContext("subnet", "get") - subnet, err := subnets.Get(c.serviceClient, id).Extract() + subnet, err := subnets.Get(context.TODO(), c.serviceClient, id).Extract() if mc.ObserveRequestIgnoreNotFound(err) != nil { return nil, err } @@ -427,7 +428,7 @@ func (c networkClient) GetSubnet(id string) (*subnets.Subnet, error) { func (c networkClient) UpdateSubnet(id string, opts subnets.UpdateOptsBuilder) (*subnets.Subnet, error) { mc := metrics.NewMetricPrometheusContext("subnet", "update") - subnet, err := subnets.Update(c.serviceClient, id, opts).Extract() + subnet, err := subnets.Update(context.TODO(), c.serviceClient, id, opts).Extract() if mc.ObserveRequest(err) != nil { return nil, err } @@ -436,7 +437,7 @@ func (c networkClient) UpdateSubnet(id string, opts subnets.UpdateOptsBuilder) ( func (c networkClient) ListExtensions() ([]extensions.Extension, error) { mc := metrics.NewMetricPrometheusContext("network_extension", "list") - allPages, err := extensions.List(c.serviceClient).AllPages() + allPages, err := extensions.List(c.serviceClient).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } diff --git a/pkg/clients/volume.go b/pkg/clients/volume.go index 32395863e7..7a30d28cef 100644 --- a/pkg/clients/volume.go +++ b/pkg/clients/volume.go @@ -17,12 +17,13 @@ limitations under the License. package clients import ( + "context" "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" ) @@ -51,7 +52,7 @@ func NewVolumeClient(providerClient *gophercloud.ProviderClient, providerClientO func (c volumeClient) ListVolumes(opts volumes.ListOptsBuilder) ([]volumes.Volume, error) { mc := metrics.NewMetricPrometheusContext("volume", "list") - pages, err := volumes.List(c.client, opts).AllPages() + pages, err := volumes.List(c.client, opts).AllPages(context.TODO()) if mc.ObserveRequest(err) != nil { return nil, err } @@ -60,19 +61,19 @@ func (c volumeClient) ListVolumes(opts volumes.ListOptsBuilder) ([]volumes.Volum func (c volumeClient) CreateVolume(opts volumes.CreateOptsBuilder) (*volumes.Volume, error) { mc := metrics.NewMetricPrometheusContext("volume", "create") - volume, err := volumes.Create(c.client, opts).Extract() + volume, err := volumes.Create(context.TODO(), c.client, opts).Extract() return volume, mc.ObserveRequest(err) } func (c volumeClient) DeleteVolume(volumeID string, opts volumes.DeleteOptsBuilder) error { mc := metrics.NewMetricPrometheusContext("volume", "delete") - err := volumes.Delete(c.client, volumeID, opts).ExtractErr() + err := volumes.Delete(context.TODO(), c.client, volumeID, opts).ExtractErr() return mc.ObserveRequestIgnoreNotFound(err) } func (c volumeClient) GetVolume(volumeID string) (*volumes.Volume, error) { mc := metrics.NewMetricPrometheusContext("volume", "get") - volume, err := volumes.Get(c.client, volumeID).Extract() + volume, err := volumes.Get(context.TODO(), c.client, volumeID).Extract() return volume, mc.ObserveRequestIgnoreNotFound(err) } 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 747fbf02bb..8f4a14f82d 100644 --- a/pkg/cloud/services/compute/instance.go +++ b/pkg/cloud/services/compute/instance.go @@ -23,13 +23,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" @@ -218,7 +218,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 bc5b01def5..2bfe2070e0 100644 --- a/pkg/cloud/services/compute/instance_test.go +++ b/pkg/cloud/services/compute/instance_test.go @@ -24,12 +24,12 @@ import ( "github.com/go-logr/logr/testr" "github.com/golang/mock/gomock" - "github.com/gophercloud/gophercloud" - "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes" - "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/v2" + "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/flavors" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers" + "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" . "github.com/onsi/gomega" "k8s.io/apimachinery/pkg/runtime" "k8s.io/utils/pointer" @@ -329,7 +329,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) @@ -374,7 +373,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) @@ -416,7 +414,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"}) }, @@ -461,7 +458,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) @@ -472,7 +468,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) @@ -546,7 +541,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) @@ -613,7 +607,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 e4107ba302..a41b9a3c7b 100644 --- a/pkg/cloud/services/compute/referenced_resources_test.go +++ b/pkg/cloud/services/compute/referenced_resources_test.go @@ -22,9 +22,9 @@ import ( "github.com/go-logr/logr/testr" "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/openstack/networking/v2/extensions" + "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/servergroups" + "github.com/gophercloud/gophercloud/v2/openstack/imageservice/v2/images" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions" . "github.com/onsi/gomega" infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1" diff --git a/pkg/cloud/services/compute/servergroup.go b/pkg/cloud/services/compute/servergroup.go index f4118da73f..0f4cf11984 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/v1beta1" ) diff --git a/pkg/cloud/services/compute/servergroup_test.go b/pkg/cloud/services/compute/servergroup_test.go index 2771ccf26a..71ae88d115 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/testr" "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/v1beta1" "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 38dda5ecb6..569e1235e2 100644 --- a/pkg/cloud/services/loadbalancer/loadbalancer.go +++ b/pkg/cloud/services/loadbalancer/loadbalancer.go @@ -24,10 +24,10 @@ import ( "slices" "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" utilsnet "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 f264a83415..ba0f5e2ec2 100644 --- a/pkg/cloud/services/loadbalancer/loadbalancer_test.go +++ b/pkg/cloud/services/loadbalancer/loadbalancer_test.go @@ -24,12 +24,12 @@ import ( "github.com/go-logr/logr/testr" "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" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" diff --git a/pkg/cloud/services/networking/floatingip.go b/pkg/cloud/services/networking/floatingip.go index f7fc8dc308..31dd7a245a 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 e25a42ab53..16b9e2f508 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/v1beta1" diff --git a/pkg/cloud/services/networking/network.go b/pkg/cloud/services/networking/network.go index 20df7b96bb..ef0118ff48 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/v1beta1" "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 27a07580ba..6a9d03595f 100644 --- a/pkg/cloud/services/networking/network_test.go +++ b/pkg/cloud/services/networking/network_test.go @@ -21,10 +21,10 @@ import ( "github.com/go-logr/logr/testr" "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 e9e8c6df3a..632a2da15a 100644 --- a/pkg/cloud/services/networking/port.go +++ b/pkg/cloud/services/networking/port.go @@ -23,9 +23,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" "k8s.io/utils/pointer" diff --git a/pkg/cloud/services/networking/port_test.go b/pkg/cloud/services/networking/port_test.go index 5219886060..25c06fc397 100644 --- a/pkg/cloud/services/networking/port_test.go +++ b/pkg/cloud/services/networking/port_test.go @@ -22,13 +22,13 @@ import ( "github.com/go-logr/logr/testr" "github.com/golang/mock/gomock" "github.com/google/go-cmp/cmp" - "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/networks" - "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/networks" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets" . "github.com/onsi/gomega" "k8s.io/utils/pointer" diff --git a/pkg/cloud/services/networking/router.go b/pkg/cloud/services/networking/router.go index 88fe117f1f..2c5cbf8613 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/v1beta1" "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 175b46e179..dd427aa27e 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/v1beta1" "sigs.k8s.io/cluster-api-provider-openstack/pkg/record" diff --git a/pkg/cloud/services/networking/securitygroups_test.go b/pkg/cloud/services/networking/securitygroups_test.go index b88a81cd43..902a2124dc 100644 --- a/pkg/cloud/services/networking/securitygroups_test.go +++ b/pkg/cloud/services/networking/securitygroups_test.go @@ -21,8 +21,8 @@ import ( "github.com/go-logr/logr/testr" "github.com/golang/mock/gomock" - "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/security/groups" + "github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/security/rules" . "github.com/onsi/gomega" "k8s.io/utils/pointer" diff --git a/pkg/cloud/services/networking/service.go b/pkg/cloud/services/networking/service.go index 3a01c48b85..f6a3570998 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 a75519d8a8..c9e9dd6505 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/v1beta1" diff --git a/pkg/scope/mock.go b/pkg/scope/mock.go index 3f3cec13be..546f60bfb8 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 d20cee5bc2..9652413b6c 100644 --- a/pkg/scope/provider.go +++ b/pkg/scope/provider.go @@ -25,11 +25,11 @@ 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" + "github.com/gophercloud/utils/v2/openstack/clientconfig" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/cache" @@ -213,7 +213,7 @@ func (s *providerScope) ExtractToken() (*tokens.Token, error) { if err != nil { return nil, fmt.Errorf("create new identity service client: %w", err) } - return tokens.Get(client, s.providerClient.Token()).ExtractToken() + return tokens.Get(context.TODO(), client, s.providerClient.Token()).ExtractToken() } func NewProviderClient(cloud clientconfig.Cloud, caCert []byte, logger logr.Logger) (*gophercloud.ProviderClient, *clientconfig.ClientOpts, string, error) { @@ -268,7 +268,7 @@ func NewProviderClient(cloud clientconfig.Cloud, caCert []byte, logger logr.Logg Logger: &gophercloudLogger{logger}, } } - err = openstack.Authenticate(provider, *opts) + err = openstack.Authenticate(context.TODO(), provider, *opts) if err != nil { return nil, nil, "", fmt.Errorf("providerClient authentication err: %v", err) } diff --git a/pkg/scope/scope.go b/pkg/scope/scope.go index 6792df2fb7..39ab469f50 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..aff5a2d253 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 { diff --git a/test/e2e/shared/openstack.go b/test/e2e/shared/openstack.go index 2fd5f95d56..4449aa9aab 100644 --- a/test/e2e/shared/openstack.go +++ b/test/e2e/shared/openstack.go @@ -31,23 +31,23 @@ 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/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/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" - 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/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/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/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" + uflavors "github.com/gophercloud/utils/v2/openstack/compute/v2/flavors" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/ini.v1" @@ -78,7 +78,7 @@ func ensureSSHKeyPair(e2eCtx *E2EContext) { keyPairCreateOpts := &keypairs.CreateOpts{ Name: DefaultSSHKeyPairName, } - keypair, err := keypairs.Create(computeClient, keyPairCreateOpts).Extract() + keypair, err := keypairs.Create(context.TODO(), computeClient, keyPairCreateOpts).Extract() if err != nil { if strings.Contains(err.Error(), "already exists") { return @@ -165,7 +165,7 @@ func dumpOpenStackImages(providerClient *gophercloud.ProviderClient, clientOpts return fmt.Errorf("error creating compute client: %s", err) } - allPages, err := images.List(imageClient, images.ListOpts{}).AllPages() + allPages, err := images.List(imageClient, images.ListOpts{}).AllPages(context.TODO()) if err != nil { return fmt.Errorf("error getting images: %s", err) } @@ -260,7 +260,7 @@ func DumpOpenStackServers(e2eCtx *E2EContext, filter servers.ListOpts) ([]server } computeClient.Microversion = clients.NovaMinimumMicroversion - allPages, err := servers.List(computeClient, filter).AllPages() + allPages, err := servers.List(computeClient, filter).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error listing servers: %v", err) } @@ -287,7 +287,7 @@ func DumpOpenStackNetworks(e2eCtx *E2EContext, filter networks.ListOpts) ([]netw return nil, fmt.Errorf("error creating network client: %s", err) } - allPages, err := networks.List(networkClient, filter).AllPages() + allPages, err := networks.List(networkClient, filter).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error listing networks: %s", err) } @@ -312,7 +312,7 @@ func DumpOpenStackSubnets(e2eCtx *E2EContext, filter subnets.ListOpts) ([]subnet return nil, fmt.Errorf("error creating network client: %s", err) } - allPages, err := subnets.List(networkClient, filter).AllPages() + allPages, err := subnets.List(networkClient, filter).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error listing subnets: %s", err) } @@ -337,7 +337,7 @@ func DumpOpenStackRouters(e2eCtx *E2EContext, filter routers.ListOpts) ([]router return nil, fmt.Errorf("error creating network client: %s", err) } - allPages, err := routers.List(networkClient, filter).AllPages() + allPages, err := routers.List(networkClient, filter).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error listing routers: %s", err) } @@ -362,7 +362,7 @@ func DumpOpenStackSecurityGroups(e2eCtx *E2EContext, filter groups.ListOpts) ([] return nil, fmt.Errorf("error creating network client: %s", err) } - allPages, err := groups.List(networkClient, filter).AllPages() + allPages, err := groups.List(networkClient, filter).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error listing security groups: %s", err) } @@ -390,7 +390,7 @@ func DumpCalicoSecurityGroupRules(e2eCtx *E2EContext, openStackCluster *infrav1. } controlPlaneSGID := openStackCluster.Status.ControlPlaneSecurityGroup.ID - controlPlaneSGRules, err := rules.List(networkClient, rules.ListOpts{SecGroupID: controlPlaneSGID}).AllPages() + controlPlaneSGRules, err := rules.List(networkClient, rules.ListOpts{SecGroupID: controlPlaneSGID}).AllPages(context.TODO()) if err != nil { return 0, fmt.Errorf("error listing control plane security group rules: %s", err) } @@ -400,7 +400,7 @@ func DumpCalicoSecurityGroupRules(e2eCtx *E2EContext, openStackCluster *infrav1. } workerSGID := openStackCluster.Status.WorkerSecurityGroup.ID - workerSGRules, err := rules.List(networkClient, rules.ListOpts{SecGroupID: workerSGID}).AllPages() + workerSGRules, err := rules.List(networkClient, rules.ListOpts{SecGroupID: workerSGID}).AllPages(context.TODO()) if err != nil { return 0, fmt.Errorf("error listing worker security group rules: %s", err) } @@ -439,7 +439,7 @@ func DumpOpenStackVolumes(e2eCtx *E2EContext, filter volumes.ListOpts) ([]volume return nil, fmt.Errorf("error creating block storage client: %s", err) } - allPages, err := volumes.List(blockStorageClient, filter).AllPages() + allPages, err := volumes.List(blockStorageClient, filter).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error listing volumes: %s", err) } @@ -464,7 +464,7 @@ func DumpOpenStackPorts(e2eCtx *E2EContext, filter ports.ListOpts) ([]ports.Port return nil, fmt.Errorf("error creating network client: %s", err) } - allPages, err := ports.List(networkClient, filter).AllPages() + allPages, err := ports.List(networkClient, filter).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error getting ports: %s", err) } @@ -494,7 +494,7 @@ func CreateOpenStackSecurityGroup(e2eCtx *E2EContext, securityGroupName, descrip Description: description, } - _, err = groups.Create(networkClient, createOpts).Extract() + _, err = groups.Create(context.TODO(), networkClient, createOpts).Extract() if err != nil { return err } @@ -517,7 +517,7 @@ func DumpOpenStackTrunks(e2eCtx *E2EContext, portID string) (*trunks.Trunk, erro allPages, err := trunks.List(networkClient, trunks.ListOpts{ PortID: portID, - }).AllPages() + }).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error getting trunks: %s", err) } @@ -546,7 +546,7 @@ func GetOpenStackServers(e2eCtx *E2EContext, openStackCluster *infrav1.OpenStack } serverListOpts := &servers.ListOpts{} - allPages, err := servers.List(computeClient, serverListOpts).AllPages() + allPages, err := servers.List(computeClient, serverListOpts).AllPages(context.TODO()) if err != nil { return nil, fmt.Errorf("error listing server: %v", err) } @@ -759,7 +759,7 @@ func GetComputeAvailabilityZones(e2eCtx *E2EContext) []string { computeClient, err := openstack.NewComputeV2(providerClient, gophercloud.EndpointOpts{Region: clientOpts.RegionName}) Expect(err).NotTo(HaveOccurred()) - allPages, err := availabilityzones.List(computeClient).AllPages() + allPages, err := availabilityzones.List(computeClient).AllPages(context.TODO()) Expect(err).NotTo(HaveOccurred()) availabilityZoneList, err := availabilityzones.ExtractAvailabilityZones(allPages) Expect(err).NotTo(HaveOccurred()) @@ -792,7 +792,7 @@ func CreateOpenStackNetwork(e2eCtx *E2EContext, name, cidr string) (*networks.Ne Name: name, AdminStateUp: gophercloud.Enabled, } - net, err := networks.Create(networkClient, netCreateOpts).Extract() + net, err := networks.Create(context.TODO(), networkClient, netCreateOpts).Extract() if err != nil { return net, err } @@ -803,9 +803,9 @@ func CreateOpenStackNetwork(e2eCtx *E2EContext, name, cidr string) (*networks.Ne IPVersion: 4, CIDR: cidr, } - _, err = subnets.Create(networkClient, subnetCreateOpts).Extract() + _, err = subnets.Create(context.TODO(), networkClient, subnetCreateOpts).Extract() if err != nil { - networks.Delete(networkClient, net.ID) + networks.Delete(context.TODO(), networkClient, net.ID) return nil, err } return net, nil @@ -825,7 +825,7 @@ func DeleteOpenStackNetwork(e2eCtx *E2EContext, id string) error { return fmt.Errorf("error creating network client: %s", err) } - return networks.Delete(networkClient, id).ExtractErr() + return networks.Delete(context.TODO(), networkClient, id).ExtractErr() } func GetOpenStackVolume(e2eCtx *E2EContext, name string) (*volumes.Volume, error) { @@ -842,7 +842,7 @@ func GetOpenStackVolume(e2eCtx *E2EContext, name string) (*volumes.Volume, error return nil, fmt.Errorf("error creating volume client: %s", err) } - volume, err := volumes.Get(volumeClient, name).Extract() + volume, err := volumes.Get(context.TODO(), volumeClient, name).Extract() if err != nil { return volume, err } @@ -860,8 +860,8 @@ func GetFlavorFromName(e2eCtx *E2EContext, name string) (*flavors.Flavor, error) computeClient, err := openstack.NewComputeV2(providerClient, gophercloud.EndpointOpts{Region: clientOpts.RegionName}) Expect(err).NotTo(HaveOccurred()) - flavorID, err := uflavors.IDFromName(computeClient, name) + flavorID, err := uflavors.IDFromName(context.TODO(), computeClient, name) Expect(err).NotTo(HaveOccurred()) - return flavors.Get(computeClient, flavorID).Extract() + return flavors.Get(context.TODO(), computeClient, flavorID).Extract() } diff --git a/test/e2e/suites/e2e/e2e_test.go b/test/e2e/suites/e2e/e2e_test.go index c184f96011..46e7a3693b 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"