diff --git a/Dockerfile b/Dockerfile index f0aaf98f..43839653 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ COPY go.sum go.sum COPY cmd/ cmd/ COPY api/ api/ COPY internal/ internal/ +COPY controllers/ controllers/ COPY mount-daemon/ mount-daemon/ COPY utils/ utils/ COPY vendor/ vendor/ diff --git a/cmd/main.go b/cmd/main.go index ec7c0cc1..0a4d9831 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -35,7 +35,7 @@ import ( dwsv1alpha1 "github.com/DataWorkflowServices/dws/api/v1alpha1" dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" - "github.com/DataWorkflowServices/dws/internal/controller" + "github.com/DataWorkflowServices/dws/controllers" //+kubebuilder:scaffold:imports ) @@ -87,7 +87,7 @@ func main() { switch mode { case "controller": - if err = (&controller.WorkflowReconciler{ + if err = (&controllers.WorkflowReconciler{ Client: mgr.GetClient(), Log: ctrl.Log.WithName("controllers").WithName("Workflow"), Scheme: mgr.GetScheme(), @@ -97,7 +97,7 @@ func main() { } if os.Getenv("ENVIRONMENT") == "kind" { - if err = (&controller.ClientMountReconciler{ + if err = (&controllers.ClientMountReconciler{ Client: mgr.GetClient(), Log: ctrl.Log.WithName("controllers").WithName("ClientMount"), Scheme: mgr.GetScheme(), diff --git a/internal/controller/clientmount_controller.go b/controllers/clientmount_controller.go similarity index 99% rename from internal/controller/clientmount_controller.go rename to controllers/clientmount_controller.go index 709368d8..a06797e7 100644 --- a/internal/controller/clientmount_controller.go +++ b/controllers/clientmount_controller.go @@ -17,7 +17,7 @@ * limitations under the License. */ -package controller +package controllers import ( "context" diff --git a/internal/controller/workflow_controller.go b/controllers/workflow_controller.go similarity index 99% rename from internal/controller/workflow_controller.go rename to controllers/workflow_controller.go index 94dc814c..ba08ea1d 100644 --- a/internal/controller/workflow_controller.go +++ b/controllers/workflow_controller.go @@ -17,7 +17,7 @@ * limitations under the License. */ -package controller +package controllers import ( "context" diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index b7b0b174..24257ffb 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -37,6 +37,7 @@ import ( dwsv1alpha1 "github.com/DataWorkflowServices/dws/api/v1alpha1" dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2" + "github.com/DataWorkflowServices/dws/controllers" //+kubebuilder:scaffold:imports ) @@ -147,7 +148,7 @@ var _ = BeforeSuite(func() { // start reconcilers - err = (&WorkflowReconciler{ + err = (&controllers.WorkflowReconciler{ Client: k8sManager.GetClient(), Log: ctrl.Log.WithName("controllers").WithName("Workflow"), Scheme: testEnv.Scheme,