Merge pull request kubernetes-sigs#2 from alexander-demichev/rename

Rename module to machine-api-provider-azure
JoelSpeed · Nov 22, 2021 · 4916b30 · 4916b30
2 parents d71ae25 + 2dc4772
commit 4916b30
Show file tree

Hide file tree

Showing 73 changed files with 148 additions and 148 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,12 +13,12 @@
 # limitations under the License.
 
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.16 as builder
-WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-azure
+WORKDIR /go/src/github.com/openshift/machine-api-provider-azure
 COPY . .
 # VERSION env gets set in the openshift/release image and refers to the golang version, which interferes with our own
 RUN unset VERSION \
   && GOPROXY=off NO_DOCKER=1 make build
 
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
-COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/machine-controller-manager /
-COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/termination-handler /
+COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/machine-controller-manager /
+COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/termination-handler /
diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -13,12 +13,12 @@
 # limitations under the License.
 
 FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.9 AS builder
-WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-azure
+WORKDIR /go/src/github.com/openshift/machine-api-provider-azure
 COPY . .
 # VERSION env gets set in the openshift/release image and refers to the golang version, which interferes with our own
 RUN unset VERSION \
   && GOPROXY=off NO_DOCKER=1 make build
 
 FROM registry.ci.openshift.org/ocp/4.9:base
-COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/machine-controller-manager /
-COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-azure/bin/termination-handler /
+COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/machine-controller-manager /
+COPY --from=builder /go/src/github.com/openshift/machine-api-provider-azure/bin/termination-handler /
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ GOGCFLAGS ?= -gcflags=all="-N -l"
 endif
 
 VERSION     ?= $(shell git describe --always --abbrev=7)
-REPO_PATH   ?= sigs.k8s.io/cluster-api-provider-azure
+REPO_PATH   ?= github.com/openshift/machine-api-provider-azure
 LD_FLAGS    ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION) -extldflags -static
 
 GO111MODULE = on
@@ -59,7 +59,7 @@ ifeq ($(NO_DOCKER), 1)
   IMAGE_BUILD_CMD = imagebuilder
   export CGO_ENABLED
 else
-  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
+  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
   IMAGE_BUILD_CMD = $(ENGINE)  build
 endif
 

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -25,11 +25,11 @@ import (
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	"github.com/openshift/machine-api-operator/pkg/controller/machine"
 	"github.com/openshift/machine-api-operator/pkg/metrics"
+	actuator "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators/machine"
+	machinesetcontroller "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators/machineset"
+	"github.com/openshift/machine-api-provider-azure/pkg/record"
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
-	actuator "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machine"
-	machinesetcontroller "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machineset"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/controller"

diff --git a/cmd/termination-handler/main.go b/cmd/termination-handler/main.go
@@ -17,9 +17,9 @@ import (
 	"flag"
 	"time"
 
+	"github.com/openshift/machine-api-provider-azure/pkg/termination"
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/klogr"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/termination"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/cluster-api-provider-azure
+module github.com/openshift/machine-api-provider-azure
 
 go 1.16
 

diff --git a/pkg/apis/azureprovider/v1beta1/conversion.go b/pkg/apis/azureprovider/v1beta1/conversion.go
@@ -1,6 +1,6 @@
 package v1beta1
 
-import "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+import "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 
 var (
 	// MachineStatusFromProviderStatus unmarshals a raw extension into an AzureMachineProviderStatus type.

diff --git a/pkg/cloud/azure/actuators/machine/actuator.go b/pkg/cloud/azure/actuators/machine/actuator.go
@@ -25,10 +25,10 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	machineapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
 	controllerclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 

diff --git a/pkg/cloud/azure/actuators/machine/actuator_test.go b/pkg/cloud/azure/actuators/machine/actuator_test.go
@@ -34,17 +34,17 @@ import (
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	"github.com/openshift/machine-api-operator/pkg/controller/machine"
 	machineapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
+	mock_azure "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/mock"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/pointer"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
-	mock_azure "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/mock"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
 	controllerfake "sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 

diff --git a/pkg/cloud/azure/actuators/machine/reconciler.go b/pkg/cloud/azure/actuators/machine/reconciler.go
@@ -30,19 +30,19 @@ import (
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
 	"github.com/openshift/machine-api-operator/pkg/metrics"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators/machineset"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/decode"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/availabilitysets"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/availabilityzones"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/disks"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/networkinterfaces"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/publicips"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/virtualmachineextensions"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
 	apicorev1 "k8s.io/api/core/v1"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machineset"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/decode"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/availabilitysets"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/availabilityzones"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/disks"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/networkinterfaces"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/publicips"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/virtualmachineextensions"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/services/virtualmachines"
 
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/pkg/cloud/azure/actuators/machine/reconciler_test.go b/pkg/cloud/azure/actuators/machine/reconciler_test.go
@@ -12,13 +12,13 @@ import (
 	. "github.com/onsi/gomega"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/decode"
+	mock_azure "github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/mock"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/decode"
-	mock_azure "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/mock"
 )
 
 func TestExists(t *testing.T) {

diff --git a/pkg/cloud/azure/actuators/machine/stubs.go b/pkg/cloud/azure/actuators/machine/stubs.go
@@ -5,9 +5,9 @@ import (
 
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 const (

diff --git a/pkg/cloud/azure/actuators/machineset/controller.go b/pkg/cloud/azure/actuators/machineset/controller.go
@@ -21,12 +21,12 @@ import (
 	"github.com/go-logr/logr"
 	machinev1 "github.com/openshift/api/machine/v1beta1"
 	mapierrors "github.com/openshift/machine-api-operator/pkg/controller/machine"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"

diff --git a/pkg/cloud/azure/mock/client_generated.go b/pkg/cloud/azure/mock/client_generated.go
diff --git a/pkg/cloud/azure/services/applicationsecuritygroups/applicationsecuritygroups.go b/pkg/cloud/azure/services/applicationsecuritygroups/applicationsecuritygroups.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network"
 	"github.com/Azure/go-autorest/autorest/to"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
 )
 
 // Spec specification for network application security groups

diff --git a/pkg/cloud/azure/services/applicationsecuritygroups/applicationsecuritygroups_stack.go b/pkg/cloud/azure/services/applicationsecuritygroups/applicationsecuritygroups_stack.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/network/mgmt/network"
 	"github.com/Azure/go-autorest/autorest/to"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
 )
 
 // Get provides information about a route table.

diff --git a/pkg/cloud/azure/services/applicationsecuritygroups/service.go b/pkg/cloud/azure/services/applicationsecuritygroups/service.go
@@ -19,8 +19,8 @@ package applicationsecuritygroups
 import (
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2021-02-01/network"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 // Service provides operations on resource groups

diff --git a/pkg/cloud/azure/services/applicationsecuritygroups/service_stack.go b/pkg/cloud/azure/services/applicationsecuritygroups/service_stack.go
@@ -19,8 +19,8 @@ package applicationsecuritygroups
 import (
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/network/mgmt/network"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 // StackHubService provides operations on resource groups

diff --git a/pkg/cloud/azure/services/availabilitysets/availabilitysets.go b/pkg/cloud/azure/services/availabilitysets/availabilitysets.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 )
 
 // Spec input specification for Get/CreateOrUpdate/Delete calls

diff --git a/pkg/cloud/azure/services/availabilitysets/service.go b/pkg/cloud/azure/services/availabilitysets/service.go
@@ -3,8 +3,8 @@ package availabilitysets
 import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 // Service provides operations on availability zones

diff --git a/pkg/cloud/azure/services/availabilityzones/availabilityzones.go b/pkg/cloud/azure/services/availabilityzones/availabilityzones.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"strings"
 
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 )
 
 // Spec input specification for Get/CreateOrUpdate/Delete calls

diff --git a/pkg/cloud/azure/services/availabilityzones/availabilityzones_stack.go b/pkg/cloud/azure/services/availabilityzones/availabilityzones_stack.go
@@ -21,7 +21,7 @@ import (
 	"errors"
 	"strings"
 
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 )
 
 // Get provides information about a availability zones.

diff --git a/pkg/cloud/azure/services/availabilityzones/service.go b/pkg/cloud/azure/services/availabilityzones/service.go
@@ -19,8 +19,8 @@ package availabilityzones
 import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 // Service provides operations on availability zones

diff --git a/pkg/cloud/azure/services/availabilityzones/service_stack.go b/pkg/cloud/azure/services/availabilityzones/service_stack.go
@@ -19,8 +19,8 @@ package availabilityzones
 import (
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 // StackHubService provides operations on availability zones

diff --git a/pkg/cloud/azure/services/disks/disks.go b/pkg/cloud/azure/services/disks/disks.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
 )
 
 // Spec specification for disk

diff --git a/pkg/cloud/azure/services/disks/disks_stack.go b/pkg/cloud/azure/services/disks/disks_stack.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
 )
 
 // Get on disk is currently no-op. OS disks should only be deleted and will create with the VM automatically.

diff --git a/pkg/cloud/azure/services/disks/service.go b/pkg/cloud/azure/services/disks/service.go
@@ -19,8 +19,8 @@ package disks
 import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2021-03-01/compute"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 var _ azure.Service = (*Service)(nil)

diff --git a/pkg/cloud/azure/services/disks/service_stack.go b/pkg/cloud/azure/services/disks/service_stack.go
@@ -19,8 +19,8 @@ package disks
 import (
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/compute/mgmt/compute"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 var _ azure.Service = (*Service)(nil)

diff --git a/pkg/cloud/azure/services/groups/groups.go b/pkg/cloud/azure/services/groups/groups.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2020-06-01/resources"
 	"github.com/Azure/go-autorest/autorest/to"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
 )
 
 // MicroSoftComputeVirtualMachines constant because the library does not include one for this value.

diff --git a/pkg/cloud/azure/services/groups/groups_stack.go b/pkg/cloud/azure/services/groups/groups_stack.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/resources/mgmt/resources"
 	"github.com/Azure/go-autorest/autorest/to"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
 	"k8s.io/klog/v2"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
 )
 
 // Get provides information about a resource group.

diff --git a/pkg/cloud/azure/services/groups/service.go b/pkg/cloud/azure/services/groups/service.go
@@ -19,8 +19,8 @@ package groups
 import (
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2020-06-01/resources"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 // Service provides operations on resource groups

diff --git a/pkg/cloud/azure/services/groups/service_stack.go b/pkg/cloud/azure/services/groups/service_stack.go
@@ -19,8 +19,8 @@ package groups
 import (
 	"github.com/Azure/azure-sdk-for-go/profiles/2019-03-01/resources/mgmt/resources"
 	"github.com/Azure/go-autorest/autorest"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure"
-	"sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure"
+	"github.com/openshift/machine-api-provider-azure/pkg/cloud/azure/actuators"
 )
 
 // StackHubService provides operations on resource groups