Skip to content

Commit 4916b30

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request kubernetes-sigs#2 from alexander-demichev/rename
Rename module to machine-api-provider-azure
2 parents d71ae25 + 2dc4772 commit 4916b30

File tree

73 files changed

+148
-148
lines changed

Some content is hidden

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

73 files changed

+148
-148
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# limitations under the License.
1414

1515
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.16 as builder
16-
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-azure
16+
WORKDIR /go/src/github.com/openshift/machine-api-provider-azure
1717
COPY . .
1818
# VERSION env gets set in the openshift/release image and refers to the golang version, which interferes with our own
1919
RUN unset VERSION \
2020
&& GOPROXY=off NO_DOCKER=1 make build
2121

2222
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
23-
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/machine-controller-manager /
24-
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/termination-handler /
23+
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/machine-controller-manager /
24+
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/termination-handler /

‎Dockerfile.rhel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# limitations under the License.
1414

1515
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
16-
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-azure
16+
WORKDIR /go/src/github.com/openshift/machine-api-provider-azure
1717
COPY . .
1818
# VERSION env gets set in the openshift/release image and refers to the golang version, which interferes with our own
1919
RUN unset VERSION \
2020
&& GOPROXY=off NO_DOCKER=1 make build
2121

2222
FROM registry.ci.openshift.org/ocp/4.9:base
23-
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/machine-controller-manager /
24-
COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/termination-handler /
23+
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/machine-controller-manager /
24+
COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/termination-handler /

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GOGCFLAGS ?= -gcflags=all="-N -l"
2222
endif
2323

2424
VERSION ?= $(shell git describe --always --abbrev=7)
25-
REPO_PATH ?= sigs.k8s.io/cluster-api-provider-azure
25+
REPO_PATH ?= github.com/openshift/machine-api-provider-azure
2626
LD_FLAGS ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION) -extldflags -static
2727

2828
GO111MODULE = on
@@ -59,7 +59,7 @@ ifeq ($(NO_DOCKER), 1)
5959
IMAGE_BUILD_CMD = imagebuilder
6060
export CGO_ENABLED
6161
else
62-
DOCKER_CMD = $(ENGINE) run --rm -e CGO_ENABLED=$(CGO_ENABLED) -e GOARCH=$(GOARCH) -e GOOS=$(GOOS) -v "$(PWD)":/go/src/sigs.k8s.io/cluster-api-provider-azure:Z -w /go/src/sigs.k8s.io/cluster-api-provider-azure openshift/origin-release:golang-1.16
62+
DOCKER_CMD = $(ENGINE) run --rm -e CGO_ENABLED=$(CGO_ENABLED) -e GOARCH=$(GOARCH) -e GOOS=$(GOOS) -v "$(PWD)":/go/src/github.com/openshift/machine-api-provider-azure:Z -w /go/src/github.com/openshift/machine-api-provider-azure openshift/origin-release:golang-1.16
6363
IMAGE_BUILD_CMD = $(ENGINE) build
6464
endif
6565

‎cmd/manager/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
machinev1 "github.com/openshift/api/machine/v1beta1"
2626
"github.com/openshift/machine-api-operator/pkg/controller/machine"
2727
"github.com/openshift/machine-api-operator/pkg/metrics"
28+
actuator "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators/machine"
29+
machinesetcontroller "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators/machineset"
30+
"github.com/openshift/machine-api-provider-azure/pkg/record"
2831
"k8s.io/klog/v2"
2932
"k8s.io/klog/v2/klogr"
30-
actuator "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machine"
31-
machinesetcontroller "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machineset"
32-
"sigs.k8s.io/cluster-api-provider-azure/pkg/record"
3333
ctrl "sigs.k8s.io/controller-runtime"
3434
"sigs.k8s.io/controller-runtime/pkg/client/config"
3535
"sigs.k8s.io/controller-runtime/pkg/controller"

‎cmd/termination-handler/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import (
1717
"flag"
1818
"time"
1919

20+
"github.com/openshift/machine-api-provider-azure/pkg/termination"
2021
"k8s.io/klog/v2"
2122
"k8s.io/klog/v2/klogr"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/termination"
2323
ctrl "sigs.k8s.io/controller-runtime"
2424
"sigs.k8s.io/controller-runtime/pkg/client/config"
2525
)

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module sigs.k8s.io/cluster-api-provider-azure
1+
module github.com/openshift/machine-api-provider-azure
22

33
go 1.16
44

‎pkg/apis/azureprovider/v1beta1/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package v1beta1
22

3-
import "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
3+
import "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
44

55
var (
66
// MachineStatusFromProviderStatus unmarshals a raw extension into an AzureMachineProviderStatus type.

‎pkg/cloud/azure/actuators/machine/actuator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"github.com/Azure/go-autorest/autorest"
2626
machinev1 "github.com/openshift/api/machine/v1beta1"
2727
machineapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
28+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2829
corev1 "k8s.io/api/core/v1"
2930
"k8s.io/client-go/tools/record"
3031
"k8s.io/klog/v2"
31-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
3232
controllerclient "sigs.k8s.io/controller-runtime/pkg/client"
3333
)
3434

‎pkg/cloud/azure/actuators/machine/actuator_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ import (
3434
machinev1 "github.com/openshift/api/machine/v1beta1"
3535
"github.com/openshift/machine-api-operator/pkg/controller/machine"
3636
machineapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
37+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
38+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
39+
mock_azure "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/mock"
40+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
3741
corev1 "k8s.io/api/core/v1"
3842
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3943
"k8s.io/apimachinery/pkg/runtime"
4044
"k8s.io/client-go/kubernetes/scheme"
4145
"k8s.io/client-go/tools/record"
4246
"k8s.io/klog/v2"
4347
"k8s.io/utils/pointer"
44-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
45-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
46-
mock_azure "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/mock"
47-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
4848
controllerfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
4949
)
5050

‎pkg/cloud/azure/actuators/machine/reconciler.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ import (
3030
machinev1 "github.com/openshift/api/machine/v1beta1"
3131
machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
3232
"github.com/openshift/machine-api-operator/pkg/metrics"
33+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
34+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
35+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators/machineset"
36+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/decode"
37+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/availabilitysets"
38+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/availabilityzones"
39+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/disks"
40+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/networkinterfaces"
41+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/publicips"
42+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/virtualmachineextensions"
43+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
3344
apicorev1 "k8s.io/api/core/v1"
3445
"k8s.io/klog/v2"
35-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
36-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
37-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machineset"
38-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/decode"
39-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/availabilitysets"
40-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/availabilityzones"
41-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/disks"
42-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/networkinterfaces"
43-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/publicips"
44-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/virtualmachineextensions"
45-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
4646

4747
"sigs.k8s.io/controller-runtime/pkg/client"
4848
)

‎pkg/cloud/azure/actuators/machine/reconciler_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import (
1212
. "github.com/onsi/gomega"
1313
machinev1 "github.com/openshift/api/machine/v1beta1"
1414
machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
15+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
16+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
17+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/decode"
18+
mock_azure "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/mock"
1519
"k8s.io/apimachinery/pkg/api/resource"
1620
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1721
"k8s.io/utils/pointer"
18-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
19-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
20-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/decode"
21-
mock_azure "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/mock"
2222
)
2323

2424
func TestExists(t *testing.T) {

‎pkg/cloud/azure/actuators/machine/stubs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55

66
machinev1 "github.com/openshift/api/machine/v1beta1"
77
machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
8+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
89
corev1 "k8s.io/api/core/v1"
910
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
10-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
1111
)
1212

1313
const (

‎pkg/cloud/azure/actuators/machineset/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121
"github.com/go-logr/logr"
2222
machinev1 "github.com/openshift/api/machine/v1beta1"
2323
mapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
24+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2425
corev1 "k8s.io/api/core/v1"
2526
apierrors "k8s.io/apimachinery/pkg/api/errors"
2627
"k8s.io/apimachinery/pkg/runtime"
2728
"k8s.io/client-go/tools/record"
2829
"k8s.io/klog/v2"
29-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
3030
ctrl "sigs.k8s.io/controller-runtime"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
"sigs.k8s.io/controller-runtime/pkg/controller"

‎pkg/cloud/azure/mock/client_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/cloud/azure/services/applicationsecuritygroups/applicationsecuritygroups.go

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

2424
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network"
2525
"github.com/Azure/go-autorest/autorest/to"
26+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2627
"k8s.io/klog/v2"
27-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
2828
)
2929

3030
// Spec specification for network application security groups

‎pkg/cloud/azure/services/applicationsecuritygroups/applicationsecuritygroups_stack.go

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

2424
"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/network/mgmt/network"
2525
"github.com/Azure/go-autorest/autorest/to"
26+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2627
"k8s.io/klog/v2"
27-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
2828
)
2929

3030
// Get provides information about a route table.

‎pkg/cloud/azure/services/applicationsecuritygroups/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package applicationsecuritygroups
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
// Service provides operations on resource groups

‎pkg/cloud/azure/services/applicationsecuritygroups/service_stack.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package applicationsecuritygroups
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/network/mgmt/network"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
// StackHubService provides operations on resource groups

‎pkg/cloud/azure/services/availabilitysets/availabilitysets.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
99
"github.com/Azure/go-autorest/autorest/to"
10-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
10+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
1111
)
1212

1313
// Spec input specification for Get/CreateOrUpdate/Delete calls

‎pkg/cloud/azure/services/availabilitysets/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package availabilitysets
33
import (
44
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
55
"github.com/Azure/go-autorest/autorest"
6-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
7-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
6+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
7+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
88
)
99

1010
// Service provides operations on availability zones

‎pkg/cloud/azure/services/availabilityzones/availabilityzones.go

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

25-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
25+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2626
)
2727

2828
// Spec input specification for Get/CreateOrUpdate/Delete calls

‎pkg/cloud/azure/services/availabilityzones/availabilityzones_stack.go

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

24-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
24+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2525
)
2626

2727
// Get provides information about a availability zones.

‎pkg/cloud/azure/services/availabilityzones/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package availabilityzones
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
// Service provides operations on availability zones

‎pkg/cloud/azure/services/availabilityzones/service_stack.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package availabilityzones
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
// StackHubService provides operations on availability zones

‎pkg/cloud/azure/services/disks/disks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"fmt"
2323

2424
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
25+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2526
"k8s.io/klog/v2"
26-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
2727
)
2828

2929
// Spec specification for disk

‎pkg/cloud/azure/services/disks/disks_stack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"fmt"
2323

2424
"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
25+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2526
"k8s.io/klog/v2"
26-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
2727
)
2828

2929
// Get on disk is currently no-op. OS disks should only be deleted and will create with the VM automatically.

‎pkg/cloud/azure/services/disks/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package disks
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
var _ azure.Service = (*Service)(nil)

‎pkg/cloud/azure/services/disks/service_stack.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package disks
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
var _ azure.Service = (*Service)(nil)

‎pkg/cloud/azure/services/groups/groups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2020-06-01/resources"
2424
"github.com/Azure/go-autorest/autorest/to"
25+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2526
"k8s.io/klog/v2"
26-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
2727
)
2828

2929
// MicroSoftComputeVirtualMachines constant because the library does not include one for this value.

‎pkg/cloud/azure/services/groups/groups_stack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/resources/mgmt/resources"
2424
"github.com/Azure/go-autorest/autorest/to"
25+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
2526
"k8s.io/klog/v2"
26-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
2727
)
2828

2929
// Get provides information about a resource group.

‎pkg/cloud/azure/services/groups/service.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package groups
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2020-06-01/resources"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
// Service provides operations on resource groups

‎pkg/cloud/azure/services/groups/service_stack.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package groups
1919
import (
2020
"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/resources/mgmt/resources"
2121
"github.com/Azure/go-autorest/autorest"
22-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
23-
"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
22+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
23+
"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
2424
)
2525

2626
// StackHubService provides operations on resource groups

0 commit comments

Comments
 (0)