diff --git a/.gitignore b/.gitignore index 1bdd2af6e..b6023ff33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store .idea bin/* +cover.out diff --git a/Dockerfile b/Dockerfile index c389c0981..b1dd1e467 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN go mod download # Copy the go source COPY cmd/main.go cmd/main.go COPY api/ api/ -COPY internal/controller/ internal/controller/ +COPY controller/ controller/ # Build # the GOARCH has not a default value to allow the binary be built according to the host where the command diff --git a/cmd/main.go b/cmd/main.go index 5d6f1afae..c569c8b8d 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -18,6 +18,7 @@ package main import ( "flag" + controller2 "github.com/linode/cluster-api-provider-linode/controller" "os" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) @@ -33,7 +34,6 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" infrastructurev1alpha1 "github.com/linode/cluster-api-provider-linode/api/v1alpha1" - "github.com/linode/cluster-api-provider-linode/internal/controller" //+kubebuilder:scaffold:imports ) @@ -89,14 +89,14 @@ func main() { os.Exit(1) } - if err = (&controller.LinodeClusterReconciler{ + if err = (&controller2.LinodeClusterReconciler{ Client: mgr.GetClient(), Scheme: mgr.GetScheme(), }).SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "LinodeCluster") os.Exit(1) } - if err = (&controller.LinodeMachineReconciler{ + if err = (&controller2.LinodeMachineReconciler{ Client: mgr.GetClient(), Scheme: mgr.GetScheme(), }).SetupWithManager(mgr); err != nil { diff --git a/internal/controller/linodecluster_controller.go b/controller/linodecluster_controller.go similarity index 100% rename from internal/controller/linodecluster_controller.go rename to controller/linodecluster_controller.go diff --git a/internal/controller/linodemachine_controller.go b/controller/linodemachine_controller.go similarity index 100% rename from internal/controller/linodemachine_controller.go rename to controller/linodemachine_controller.go diff --git a/internal/controller/suite_test.go b/controller/suite_test.go similarity index 100% rename from internal/controller/suite_test.go rename to controller/suite_test.go