Skip to content

Commit c197a1f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#2107 from shiftstack/g2
🌱 Upgrade Gophercloud to v2
2 parents 6a5a926 + 3870213 commit c197a1f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+579
-672
lines changed

‎controllers/openstackcluster_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"fmt"
2323
"time"
2424

25-
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
26-
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
27-
"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
25+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks"
26+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports"
27+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets"
2828
corev1 "k8s.io/api/core/v1"
2929
apierrors "k8s.io/apimachinery/pkg/api/errors"
3030
kerrors "k8s.io/apimachinery/pkg/util/errors"

‎controllers/openstackcluster_controller_test.go‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
"testing"
2424

2525
"github.com/google/go-cmp/cmp"
26-
"github.com/gophercloud/gophercloud"
27-
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
28-
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
29-
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
30-
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
31-
"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
26+
"github.com/gophercloud/gophercloud/v2"
27+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
28+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/layer3/floatingips"
29+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/networks"
30+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports"
31+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/subnets"
3232
. "github.com/onsi/ginkgo/v2" //nolint:revive
3333
. "github.com/onsi/gomega" //nolint:revive
3434
"go.uber.org/mock/gomock"
@@ -43,7 +43,6 @@ import (
4343
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4444

4545
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
46-
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients"
4746
"sigs.k8s.io/cluster-api-provider-openstack/pkg/scope"
4847
)
4948

@@ -272,17 +271,18 @@ var _ = Describe("OpenStackCluster controller", func() {
272271
Expect(err).To(BeNil())
273272
scope := scope.NewWithLogger(clientScope, log)
274273

275-
server := clients.ServerExt{}
276-
server.ID = "adopted-bastion-uuid"
277-
server.Status = "ACTIVE"
274+
server := servers.Server{
275+
ID: "adopted-bastion-uuid",
276+
Status: "ACTIVE",
277+
}
278278

279279
networkClientRecorder := mockScopeFactory.NetworkClient.EXPECT()
280280
networkClientRecorder.ListPort(gomock.Any()).Return([]ports.Port{{ID: "portID1"}}, nil)
281281

282282
computeClientRecorder := mockScopeFactory.ComputeClient.EXPECT()
283283
computeClientRecorder.ListServers(servers.ListOpts{
284284
Name: "^capi-cluster-bastion$",
285-
}).Return([]clients.ServerExt{server}, nil)
285+
}).Return([]servers.Server{server}, nil)
286286

287287
networkClientRecorder.ListFloatingIP(floatingips.ListOpts{PortID: "portID1"}).Return(make([]floatingips.FloatingIP, 1), nil)
288288

@@ -356,9 +356,10 @@ var _ = Describe("OpenStackCluster controller", func() {
356356
Expect(err).To(BeNil())
357357
scope := scope.NewWithLogger(clientScope, log)
358358

359-
server := clients.ServerExt{}
360-
server.ID = "adopted-fip-bastion-uuid"
361-
server.Status = "ACTIVE"
359+
server := servers.Server{
360+
ID: "adopted-fip-bastion-uuid",
361+
Status: "ACTIVE",
362+
}
362363

363364
networkClientRecorder := mockScopeFactory.NetworkClient.EXPECT()
364365
networkClientRecorder.ListPort(gomock.Any()).Return([]ports.Port{{ID: "portID1"}}, nil)
@@ -438,9 +439,10 @@ var _ = Describe("OpenStackCluster controller", func() {
438439
Expect(err).To(BeNil())
439440
scope := scope.NewWithLogger(clientScope, log)
440441

441-
server := clients.ServerExt{}
442-
server.ID = "requeue-bastion-uuid"
443-
server.Status = "BUILD"
442+
server := servers.Server{
443+
ID: "requeue-bastion-uuid",
444+
Status: "BUILD",
445+
}
444446

445447
computeClientRecorder := mockScopeFactory.ComputeClient.EXPECT()
446448
computeClientRecorder.GetServer("requeue-bastion-uuid").Return(&server, nil)
@@ -495,13 +497,12 @@ var _ = Describe("OpenStackCluster controller", func() {
495497
Expect(err).To(BeNil())
496498
scope := scope.NewWithLogger(clientScope, log)
497499

498-
server := clients.ServerExt{}
499-
server.ID = "delete-bastion-uuid"
500+
server := servers.Server{ID: "delete-bastion-uuid"}
500501

501502
computeClientRecorder := mockScopeFactory.ComputeClient.EXPECT()
502503
computeClientRecorder.ListServers(servers.ListOpts{
503504
Name: "^capi-cluster-bastion$",
504-
}).Return([]clients.ServerExt{server}, nil)
505+
}).Return([]servers.Server{server}, nil)
505506
computeClientRecorder.DeleteServer("delete-bastion-uuid").Return(nil)
506507
computeClientRecorder.GetServer("delete-bastion-uuid").Return(nil, gophercloud.ErrResourceNotFound{})
507508

‎controllers/openstackmachine_controller_test.go‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@ import (
2323

2424
"github.com/go-logr/logr/testr"
2525
"github.com/google/go-cmp/cmp"
26-
"github.com/gophercloud/gophercloud"
27-
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
28-
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
29-
"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
30-
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions"
31-
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks"
32-
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
26+
"github.com/gophercloud/gophercloud/v2"
27+
"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes"
28+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
29+
"github.com/gophercloud/gophercloud/v2/openstack/image/v2/images"
30+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions"
31+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/extensions/trunks"
32+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports"
3333
. "github.com/onsi/gomega" //nolint:revive
3434
"go.uber.org/mock/gomock"
3535
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3636
"k8s.io/utils/ptr"
3737
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3838

3939
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
40-
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients"
4140
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock"
4241
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute"
4342
"sigs.k8s.io/cluster-api-provider-openstack/pkg/scope"
@@ -271,34 +270,32 @@ func Test_reconcileDelete(t *testing.T) {
271270
}
272271

273272
deleteServerByID := func(r *recorders) {
274-
r.compute.GetServer(instanceUUID).Return(&clients.ServerExt{
275-
Server: servers.Server{
276-
ID: instanceUUID,
277-
Name: openStackMachineName,
278-
},
273+
r.compute.GetServer(instanceUUID).Return(&servers.Server{
274+
ID: instanceUUID,
275+
Name: openStackMachineName,
279276
}, nil)
280277
r.compute.DeleteServer(instanceUUID).Return(nil)
281-
r.compute.GetServer(instanceUUID).Return(nil, gophercloud.ErrDefault404{})
278+
r.compute.GetServer(instanceUUID).Return(nil, gophercloud.ErrUnexpectedResponseCode{Actual: 404})
282279
}
283280
deleteServerByName := func(r *recorders) {
284281
r.compute.ListServers(servers.ListOpts{
285282
Name: "^" + openStackMachineName + "$",
286-
}).Return([]clients.ServerExt{
287-
{Server: servers.Server{
283+
}).Return([]servers.Server{
284+
{
288285
ID: instanceUUID,
289286
Name: openStackMachineName,
290-
}},
287+
},
291288
}, nil)
292289
r.compute.DeleteServer(instanceUUID).Return(nil)
293-
r.compute.GetServer(instanceUUID).Return(nil, gophercloud.ErrDefault404{})
290+
r.compute.GetServer(instanceUUID).Return(nil, gophercloud.ErrUnexpectedResponseCode{Actual: 404})
294291
}
295292

296293
deleteMissingServerByName := func(r *recorders) {
297294
// Lookup server by name because it is not in status.
298295
// Don't find it.
299296
r.compute.ListServers(servers.ListOpts{
300297
Name: "^" + openStackMachineName + "$",
301-
}).Return([]clients.ServerExt{}, nil)
298+
}).Return([]servers.Server{}, nil)
302299
}
303300

304301
deleteRootVolume := func(r *recorders) {

‎controllers/suite_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"path/filepath"
2323
"testing"
2424

25+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
2526
. "github.com/onsi/ginkgo/v2" //nolint:revive
2627
. "github.com/onsi/gomega" //nolint:revive
2728
"go.uber.org/mock/gomock"
@@ -38,7 +39,6 @@ import (
3839
"sigs.k8s.io/controller-runtime/pkg/envtest"
3940

4041
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
41-
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients"
4242
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute"
4343
"sigs.k8s.io/cluster-api-provider-openstack/pkg/scope"
4444
"sigs.k8s.io/cluster-api-provider-openstack/test/helpers/external"
@@ -172,7 +172,7 @@ var _ = Describe("When calling getOrCreate", func() {
172172
openStackCluster := &infrav1.OpenStackCluster{}
173173
machine := &clusterv1.Machine{}
174174
openStackMachine := &infrav1.OpenStackMachine{}
175-
servers := make([]clients.ServerExt, 1)
175+
servers := make([]servers.Server, 1)
176176
servers[0].ID = "machine-uuid"
177177

178178
mockScopeFactory.ComputeClient.EXPECT().ListServers(gomock.Any()).Return(servers, nil)

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ require (
88
github.com/google/go-cmp v0.6.0
99
github.com/google/gofuzz v1.2.0
1010
github.com/google/uuid v1.4.0
11-
github.com/gophercloud/gophercloud v1.11.0
12-
github.com/gophercloud/utils v0.0.0-20231010081019-80377eca5d56
11+
github.com/gophercloud/gophercloud/v2 v2.0.0
12+
github.com/gophercloud/utils/v2 v2.0.0-20240701101423-2401526caee5
1313
github.com/hashicorp/go-version v1.4.0
1414
github.com/onsi/ginkgo/v2 v2.17.1
1515
github.com/onsi/gomega v1.32.0
1616
github.com/prometheus/client_golang v1.18.0
1717
github.com/spf13/pflag v1.0.5
1818
go.uber.org/mock v0.4.0
19-
golang.org/x/crypto v0.21.0
20-
golang.org/x/text v0.14.0
19+
golang.org/x/crypto v0.24.0
20+
golang.org/x/text v0.16.0
2121
gopkg.in/ini.v1 v1.67.0
2222
k8s.io/api v0.29.3
2323
k8s.io/apiextensions-apiserver v0.29.3
@@ -69,6 +69,7 @@ require (
6969
github.com/go-openapi/swag v0.22.3 // indirect
7070
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
7171
github.com/gobuffalo/flect v1.0.2 // indirect
72+
github.com/gofrs/uuid/v5 v5.2.0 // indirect
7273
github.com/gogo/protobuf v1.3.2 // indirect
7374
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7475
github.com/golang/protobuf v1.5.4 // indirect
@@ -79,7 +80,6 @@ require (
7980
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
8081
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
8182
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
82-
github.com/hashicorp/go-uuid v1.0.3 // indirect
8383
github.com/hashicorp/hcl v1.0.0 // indirect
8484
github.com/huandu/xstrings v1.4.0 // indirect
8585
github.com/imdario/mergo v0.3.15 // indirect
@@ -127,14 +127,14 @@ require (
127127
go.uber.org/multierr v1.11.0 // indirect
128128
go.uber.org/zap v1.26.0 // indirect
129129
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
130-
golang.org/x/mod v0.14.0 // indirect
131-
golang.org/x/net v0.23.0 // indirect
130+
golang.org/x/mod v0.17.0 // indirect
131+
golang.org/x/net v0.25.0 // indirect
132132
golang.org/x/oauth2 v0.18.0 // indirect
133-
golang.org/x/sync v0.6.0 // indirect
134-
golang.org/x/sys v0.18.0 // indirect
135-
golang.org/x/term v0.18.0 // indirect
133+
golang.org/x/sync v0.7.0 // indirect
134+
golang.org/x/sys v0.21.0 // indirect
135+
golang.org/x/term v0.21.0 // indirect
136136
golang.org/x/time v0.5.0 // indirect
137-
golang.org/x/tools v0.17.0 // indirect
137+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
138138
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
139139
google.golang.org/appengine v1.6.8 // indirect
140140
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect

0 commit comments

Comments
 (0)