refactor: move controller files

argoproj-labs · May 13, 2021 · cc175fc · cc175fc
1 parent 8d8c2ae
commit cc175fc
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 6 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -4,7 +4,6 @@ ignore:
   - api/v1alpha1/generated.pb.go
   - api/v1alpha1/zz_generated.deepcopy.go
   - config
-  - controllers
   - docs
   - hack
   - kill

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,6 @@ RUN --mount=type=cache,target=/go/pkg/mod go mod download
 FROM builder AS controller-builder
 COPY .git/ .git/
 COPY api/ api/
-COPY controllers/ controllers/
 COPY manager/ manager/
 RUN go generate ./api/util/version.go
 RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 go build -a -o bin/manager ./manager

diff --git a/controllers/bus/installer.go → manager/controllers/bus/installer.go b/controllers/bus/installer.go → manager/controllers/bus/installer.go
diff --git a/controllers/bus/installer_test.go → manager/controllers/bus/installer_test.go b/controllers/bus/installer_test.go → manager/controllers/bus/installer_test.go
diff --git a/controllers/config.go → manager/controllers/config.go b/controllers/config.go → manager/controllers/config.go
diff --git a/controllers/infer.go → manager/controllers/infer.go b/controllers/infer.go → manager/controllers/infer.go
diff --git a/controllers/infer_test.go → manager/controllers/infer_test.go b/controllers/infer_test.go → manager/controllers/infer_test.go
diff --git a/controllers/pipeline_controller.go → manager/controllers/pipeline_controller.go b/controllers/pipeline_controller.go → manager/controllers/pipeline_controller.go
@@ -34,7 +34,7 @@ import (
 	"github.com/argoproj-labs/argo-dataflow/api/util"
 	"github.com/argoproj-labs/argo-dataflow/api/util/containerkiller"
 	dfv1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
-	"github.com/argoproj-labs/argo-dataflow/controllers/bus"
+	"github.com/argoproj-labs/argo-dataflow/manager/controllers/bus"
 )
 
 // PipelineReconciler reconciles a Pipeline object

diff --git a/controllers/pipeline_controller_test.go → ...r/controllers/pipeline_controller_test.go b/controllers/pipeline_controller_test.go → ...r/controllers/pipeline_controller_test.go
diff --git a/controllers/step_controller.go → manager/controllers/step_controller.go b/controllers/step_controller.go → manager/controllers/step_controller.go
diff --git a/controllers/suite_test.go → manager/controllers/suite_test.go b/controllers/suite_test.go → manager/controllers/suite_test.go
@@ -46,7 +46,7 @@ var _ = BeforeSuite(func(done Done) {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("..", "config", "crd", "bases"),
+			filepath.Join("..", "..", "config", "crd", "bases"),
 		},
 	}
 

diff --git a/manager/main.go b/manager/main.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/argoproj-labs/argo-dataflow/controllers/bus"
+	"github.com/argoproj-labs/argo-dataflow/manager/controllers/bus"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -31,7 +31,7 @@ import (
 
 	"github.com/argoproj-labs/argo-dataflow/api/util/containerkiller"
 	dataflowv1alpha1 "github.com/argoproj-labs/argo-dataflow/api/v1alpha1"
-	"github.com/argoproj-labs/argo-dataflow/controllers"
+	"github.com/argoproj-labs/argo-dataflow/manager/controllers"
 )
 
 var (