Merge pull request #500 from fluxcd/ctrl-internal

move all controllers to `internal` package
fluxcd · Mar 30, 2023 · 2ad774c · 2ad774c
2 parents 0af806c + 0c0109a
commit 2ad774c
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,6 @@ RUN go mod download
 
 # copy source code
 COPY main.go main.go
-COPY controllers/ controllers/
 COPY internal/ internal/
 
 # build

diff --git a/controllers/alert_controller.go → internal/controllers/alert_controller.go b/controllers/alert_controller.go → internal/controllers/alert_controller.go
diff --git a/controllers/alert_controller_test.go → ...rnal/controllers/alert_controller_test.go b/controllers/alert_controller_test.go → ...rnal/controllers/alert_controller_test.go
diff --git a/controllers/provider_controller.go → internal/controllers/provider_controller.go b/controllers/provider_controller.go → internal/controllers/provider_controller.go
diff --git a/controllers/provider_controller_test.go → ...l/controllers/provider_controller_test.go b/controllers/provider_controller_test.go → ...l/controllers/provider_controller_test.go
diff --git a/controllers/receiver_controller.go → internal/controllers/receiver_controller.go b/controllers/receiver_controller.go → internal/controllers/receiver_controller.go
diff --git a/controllers/receiver_controller_test.go → ...l/controllers/receiver_controller_test.go b/controllers/receiver_controller_test.go → ...l/controllers/receiver_controller_test.go
diff --git a/controllers/suite_test.go → internal/controllers/suite_test.go b/controllers/suite_test.go → internal/controllers/suite_test.go
@@ -58,7 +58,7 @@ func TestMain(m *testing.M) {
  utilruntime.Must(apiv1b2.AddToScheme(scheme.Scheme))
 
  testEnv = testenv.New(testenv.WithCRDPath(
- filepath.Join("..", "config", "crd", "bases"),
+ filepath.Join("..", "..", "config", "crd", "bases"),
  ))
 
  k8sClient, err = client.New(testEnv.Config, client.Options{Scheme: scheme.Scheme})

diff --git a/controllers/testdata/gitrepo2.yaml → internal/controllers/testdata/gitrepo2.yaml b/controllers/testdata/gitrepo2.yaml → internal/controllers/testdata/gitrepo2.yaml
diff --git a/controllers/testdata/repo.yaml → internal/controllers/testdata/repo.yaml b/controllers/testdata/repo.yaml → internal/controllers/testdata/repo.yaml
diff --git a/main.go b/main.go
@@ -44,7 +44,7 @@ import (
 
  apiv1 "github.com/fluxcd/notification-controller/api/v1"
  apiv1b2 "github.com/fluxcd/notification-controller/api/v1beta2"
- "github.com/fluxcd/notification-controller/controllers"
+ "github.com/fluxcd/notification-controller/internal/controllers"
  "github.com/fluxcd/notification-controller/internal/features"
  "github.com/fluxcd/notification-controller/internal/server"
  // +kubebuilder:scaffold:imports