Use orig controllers/ dir, but not for tests

Signed-off-by: Dean Roehrich <[email protected]>
DataWorkflowServices · Oct 20, 2023 · 5c7f93e · 5c7f93e
1 parent c123663
commit 5c7f93e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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/...rnal/controller/clientmount_controller.go → controllers/clientmount_controller.go b/...rnal/controller/clientmount_controller.go → 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 → controllers/workflow_controller.go b/internal/controller/workflow_controller.go → 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
@@ -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,