Skip to content

Commit ae20b7f

Browse files
pierreprinettipierreprinetti
committed
Upgrade to Gophercloud v2
Essentially: * Add a context argument to Gophercloud functions * Refactor scheduler hints for server creation
1 parent 458758e commit ae20b7f

File tree

282 files changed

+6303
-4502
lines changed

Some content is hidden

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

282 files changed

+6303
-4502
lines changed

‎cloudmock/openstack/mock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"net/http"
2222
"net/http/httptest"
2323

24-
"github.com/gophercloud/gophercloud"
24+
"github.com/gophercloud/gophercloud/v2"
2525
)
2626

2727
type MockOpenstackServer struct {

‎cloudmock/openstack/mockblockstorage/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"net/http/httptest"
2121
"sync"
2222

23-
cinderv3 "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
24-
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones"
23+
"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/availabilityzones"
24+
cinderv3 "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes"
2525
"k8s.io/kops/cloudmock/openstack"
2626
)
2727

‎cloudmock/openstack/mockblockstorage/availabilityzones.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"net/http"
2323

24-
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/availabilityzones"
24+
"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/availabilityzones"
2525
)
2626

2727
type availabilityZoneListResponse struct {

‎cloudmock/openstack/mockblockstorage/volumes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626

2727
"github.com/google/uuid"
28-
"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
28+
"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes"
2929
)
3030

3131
type volumeListResponse struct {

‎cloudmock/openstack/mockcompute/api.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import (
2020
"net/http/httptest"
2121
"sync"
2222

23-
"github.com/gophercloud/gophercloud"
23+
"github.com/gophercloud/gophercloud/v2"
2424

25-
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
26-
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups"
27-
"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
28-
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
29-
"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
25+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors"
26+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/keypairs"
27+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servergroups"
28+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
29+
"github.com/gophercloud/gophercloud/v2/openstack/image/v2/images"
3030
"k8s.io/kops/cloudmock/openstack"
3131
)
3232

‎cloudmock/openstack/mockcompute/flavors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"regexp"
2424

2525
"github.com/google/uuid"
26-
"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
26+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors"
2727
"k8s.io/kops/upup/pkg/fi"
2828
)
2929

‎cloudmock/openstack/mockcompute/keypairs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"net/http"
2323
"regexp"
2424

25-
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
25+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/keypairs"
2626
"k8s.io/kops/pkg/pki"
2727
)
2828

‎cloudmock/openstack/mockcompute/servergroups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"regexp"
2424

2525
"github.com/google/uuid"
26-
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups"
26+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servergroups"
2727
)
2828

2929
type serverGroupListResponse struct {

‎cloudmock/openstack/mockcompute/servers.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,20 @@ limitations under the License.
1717
package mockcompute
1818

1919
import (
20+
"context"
2021
"encoding/json"
2122
"fmt"
2223
"net/http"
2324
"net/url"
2425
"regexp"
2526
"strings"
2627

27-
"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
28+
"github.com/gophercloud/gophercloud/v2/openstack/networking/v2/ports"
2829
"k8s.io/kops/upup/pkg/fi"
2930

3031
"github.com/google/uuid"
31-
"github.com/gophercloud/gophercloud"
32-
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
32+
"github.com/gophercloud/gophercloud/v2"
33+
"github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
3334
)
3435

3536
type serverGetResponse struct {
@@ -225,7 +226,7 @@ func (m *MockClient) createServer(w http.ResponseWriter, r *http.Request) {
225226
server.SecurityGroups = securityGroups
226227

227228
portID := create.Server.Networks[0].Port
228-
ports.Update(m.networkClient, portID, ports.UpdateOpts{
229+
ports.Update(context.TODO(), m.networkClient, portID, ports.UpdateOpts{
229230
DeviceID: fi.PtrTo(server.ID),
230231
})
231232

‎cloudmock/openstack/mockdns/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"net/http/httptest"
2121
"sync"
2222

23-
"github.com/gophercloud/gophercloud/openstack/dns/v2/recordsets"
24-
"github.com/gophercloud/gophercloud/openstack/dns/v2/zones"
23+
"github.com/gophercloud/gophercloud/v2/openstack/dns/v2/recordsets"
24+
"github.com/gophercloud/gophercloud/v2/openstack/dns/v2/zones"
2525
"k8s.io/kops/cloudmock/openstack"
2626
)
2727

0 commit comments

Comments
 (0)