diff --git a/Makefile b/Makefile index b78a7c706..2be3daab6 100644 --- a/Makefile +++ b/Makefile @@ -180,14 +180,16 @@ generate-go: $(CONTROLLER_GEN) $(MOCKGEN) $(CONVERSION_GEN) $(KUBEBUILDER) $(KUS --go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(MOCKGEN) \ - -destination=./baremetal/mock_baremetal/zz_generated.baremetalcluster_manager.go \ + -destination=./baremetal/mocks/zz_generated.baremetalcluster_manager.go \ -source=./baremetal/baremetalcluster_manager.go \ + -package=baremetal_mocks \ -copyright_file=./hack/boilerplate/boilerplate.generatego.txt \ ClusterManagerInterface $(MOCKGEN) \ - -destination=./baremetal/mock_baremetal/zz_generated.baremetalmachine_manager.go \ + -destination=./baremetal/mocks/zz_generated.baremetalmachine_manager.go \ -source=./baremetal/baremetalmachine_manager.go \ + -package=baremetal_mocks \ -copyright_file=./hack/boilerplate/boilerplate.generatego.txt \ MachineManagerInterface diff --git a/baremetal/baremetalcluster_manager.go b/baremetal/baremetalcluster_manager.go index 0d4932cf8..05ba83bc1 100644 --- a/baremetal/baremetalcluster_manager.go +++ b/baremetal/baremetalcluster_manager.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - capbm "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + capbm "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" capi "sigs.k8s.io/cluster-api/api/v1alpha2" capierrors "sigs.k8s.io/cluster-api/errors" "sigs.k8s.io/cluster-api/util" diff --git a/baremetal/baremetalcluster_manager_test.go b/baremetal/baremetalcluster_manager_test.go index a88261bdd..c478f56c8 100644 --- a/baremetal/baremetalcluster_manager_test.go +++ b/baremetal/baremetalcluster_manager_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/klogr" "k8s.io/utils/pointer" - infrav1 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + infrav1 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2" capierrors "sigs.k8s.io/cluster-api/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/baremetal/baremetalmachine_manager.go b/baremetal/baremetalmachine_manager.go index 12613c341..366f9676a 100644 --- a/baremetal/baremetalmachine_manager.go +++ b/baremetal/baremetalmachine_manager.go @@ -41,7 +41,7 @@ import ( "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" clientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" - capbm "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + capbm "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" capi "sigs.k8s.io/cluster-api/api/v1alpha2" capierrors "sigs.k8s.io/cluster-api/errors" "sigs.k8s.io/cluster-api/util" diff --git a/baremetal/baremetalmachine_manager_test.go b/baremetal/baremetalmachine_manager_test.go index 6b444eb99..13f2c7a70 100644 --- a/baremetal/baremetalmachine_manager_test.go +++ b/baremetal/baremetalmachine_manager_test.go @@ -38,7 +38,7 @@ import ( clientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/klog/klogr" "k8s.io/utils/pointer" - capbm "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + capbm "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" capi "sigs.k8s.io/cluster-api/api/v1alpha2" capierrors "sigs.k8s.io/cluster-api/errors" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/baremetal/manager_factory.go b/baremetal/manager_factory.go index 1a7421412..e3f2c3d8c 100644 --- a/baremetal/manager_factory.go +++ b/baremetal/manager_factory.go @@ -18,7 +18,7 @@ package baremetal import ( "github.com/go-logr/logr" - capbm "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + capbm "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" capi "sigs.k8s.io/cluster-api/api/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/baremetal/manager_factory_test.go b/baremetal/manager_factory_test.go index 681731726..493c783af 100644 --- a/baremetal/manager_factory_test.go +++ b/baremetal/manager_factory_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/klog/klogr" - capbm "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + capbm "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" capi "sigs.k8s.io/cluster-api/api/v1alpha2" "sigs.k8s.io/controller-runtime/pkg/client" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/baremetal/mocks/zz_generated.baremetalcluster_manager.go b/baremetal/mocks/zz_generated.baremetalcluster_manager.go index 4faea13e1..f2c39786f 100644 --- a/baremetal/mocks/zz_generated.baremetalcluster_manager.go +++ b/baremetal/mocks/zz_generated.baremetalcluster_manager.go @@ -19,7 +19,7 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ./baremetal/baremetalcluster_manager.go -// Package mock_baremetal is a generated GoMock package. +// Package baremetal_mocks is a generated GoMock package. package baremetal_mocks import ( diff --git a/baremetal/mocks/zz_generated.baremetalmachine_manager.go b/baremetal/mocks/zz_generated.baremetalmachine_manager.go index b5a449eb8..3dd269025 100644 --- a/baremetal/mocks/zz_generated.baremetalmachine_manager.go +++ b/baremetal/mocks/zz_generated.baremetalmachine_manager.go @@ -19,14 +19,14 @@ // Code generated by MockGen. DO NOT EDIT. // Source: ./baremetal/baremetalmachine_manager.go -// Package mock_baremetal is a generated GoMock package. +// Package baremetal_mocks is a generated GoMock package. package baremetal_mocks import ( context "context" gomock "github.com/golang/mock/gomock" + baremetal "github.com/metal3-io/cluster-api-provider-baremetal/baremetal" reflect "reflect" - baremetal "sigs.k8s.io/cluster-api-provider-baremetal/baremetal" ) // MockMachineManagerInterface is a mock of MachineManagerInterface interface diff --git a/baremetal/suite_test.go b/baremetal/suite_test.go index 0761dc559..1b3ab5b86 100644 --- a/baremetal/suite_test.go +++ b/baremetal/suite_test.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" _ "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - infrav1 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + infrav1 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2" ) diff --git a/controllers/baremetalcluster_controller.go b/controllers/baremetalcluster_controller.go index 2ab11e01f..4f28b0432 100644 --- a/controllers/baremetalcluster_controller.go +++ b/controllers/baremetalcluster_controller.go @@ -25,8 +25,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/utils/pointer" - capbm "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" - "sigs.k8s.io/cluster-api-provider-baremetal/baremetal" + capbm "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" + "github.com/metal3-io/cluster-api-provider-baremetal/baremetal" capi "sigs.k8s.io/cluster-api/api/v1alpha2" capierrors "sigs.k8s.io/cluster-api/errors" "sigs.k8s.io/cluster-api/util" diff --git a/controllers/baremetalcluster_controller_integration_test.go b/controllers/baremetalcluster_controller_integration_test.go index 370105cb2..7fa45e557 100644 --- a/controllers/baremetalcluster_controller_integration_test.go +++ b/controllers/baremetalcluster_controller_integration_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" "k8s.io/klog/klogr" - infrav1 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" - "sigs.k8s.io/cluster-api-provider-baremetal/baremetal" + infrav1 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" + "github.com/metal3-io/cluster-api-provider-baremetal/baremetal" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/controllers/baremetalcluster_controller_test.go b/controllers/baremetalcluster_controller_test.go index b59987abf..bc7801e28 100644 --- a/controllers/baremetalcluster_controller_test.go +++ b/controllers/baremetalcluster_controller_test.go @@ -21,7 +21,7 @@ import ( "github.com/golang/mock/gomock" "github.com/pkg/errors" - baremetal_mocks "sigs.k8s.io/cluster-api-provider-baremetal/baremetal/mocks" + baremetal_mocks "github.com/metal3-io/cluster-api-provider-baremetal/baremetal/mocks" ) var _ = Describe("BareMetalCluster controller", func() { diff --git a/controllers/baremetalmachine_controller.go b/controllers/baremetalmachine_controller.go index 65b974d3a..c14956297 100644 --- a/controllers/baremetalmachine_controller.go +++ b/controllers/baremetalmachine_controller.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/pointer" - capbm "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" - "sigs.k8s.io/cluster-api-provider-baremetal/baremetal" + capbm "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" + "github.com/metal3-io/cluster-api-provider-baremetal/baremetal" capi "sigs.k8s.io/cluster-api/api/v1alpha2" capierrors "sigs.k8s.io/cluster-api/errors" "sigs.k8s.io/cluster-api/util" diff --git a/controllers/baremetalmachine_controller_integration_test.go b/controllers/baremetalmachine_controller_integration_test.go index 8de9b1732..70cdfde51 100644 --- a/controllers/baremetalmachine_controller_integration_test.go +++ b/controllers/baremetalmachine_controller_integration_test.go @@ -39,8 +39,8 @@ import ( clientfake "k8s.io/client-go/kubernetes/fake" clientcorev1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/klog/klogr" - infrav1 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" - "sigs.k8s.io/cluster-api-provider-baremetal/baremetal" + infrav1 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" + "github.com/metal3-io/cluster-api-provider-baremetal/baremetal" capi "sigs.k8s.io/cluster-api/api/v1alpha2" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2" capierrors "sigs.k8s.io/cluster-api/errors" diff --git a/controllers/baremetalmachine_controller_test.go b/controllers/baremetalmachine_controller_test.go index bbb598a56..d502ac318 100644 --- a/controllers/baremetalmachine_controller_test.go +++ b/controllers/baremetalmachine_controller_test.go @@ -32,9 +32,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/klog/klogr" "k8s.io/utils/pointer" - infrav1 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" - "sigs.k8s.io/cluster-api-provider-baremetal/baremetal" - baremetal_mocks "sigs.k8s.io/cluster-api-provider-baremetal/baremetal/mocks" + infrav1 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" + "github.com/metal3-io/cluster-api-provider-baremetal/baremetal" + baremetal_mocks "github.com/metal3-io/cluster-api-provider-baremetal/baremetal/mocks" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/handler" ) diff --git a/controllers/suite_test.go b/controllers/suite_test.go index b73ae40bb..d8d2d9d67 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/klog" - infrastructurev1alpha2 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" - infrav1 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" + infrastructurev1alpha2 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" + infrav1 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2" bmh "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1" diff --git a/go.mod b/go.mod index 67f3e0136..646c9936c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/cluster-api-provider-baremetal +module github.com/metal3-io/cluster-api-provider-baremetal go 1.13 diff --git a/main.go b/main.go index 996ca1dbf..ce4ef510e 100644 --- a/main.go +++ b/main.go @@ -31,10 +31,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/klog" "k8s.io/klog/klogr" - infrav1 "sigs.k8s.io/cluster-api-provider-baremetal/api/v1alpha2" - "sigs.k8s.io/cluster-api-provider-baremetal/baremetal" - capbmremote "sigs.k8s.io/cluster-api-provider-baremetal/baremetal/remote" - "sigs.k8s.io/cluster-api-provider-baremetal/controllers" + infrav1 "github.com/metal3-io/cluster-api-provider-baremetal/api/v1alpha2" + "github.com/metal3-io/cluster-api-provider-baremetal/baremetal" + capbmremote "github.com/metal3-io/cluster-api-provider-baremetal/baremetal/remote" + "github.com/metal3-io/cluster-api-provider-baremetal/controllers" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha2" ctrl "sigs.k8s.io/controller-runtime" // +kubebuilder:scaffold:imports