Merge pull request #653 from fluxcd/internal-controllers

Move `controllers` to `internal/controllers`
fluxcd · Mar 27, 2023 · 0d47c9c · 0d47c9c
2 parents 4ad3b21 + 3615fee
commit 0d47c9c
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,6 @@ RUN go mod download
 
 # copy source code
 COPY main.go main.go
-COPY controllers/ controllers/
 COPY internal/ internal/
 
 # build without specifing the arch

diff --git a/controllers/helmrelease_controller.go → ...nal/controllers/helmrelease_controller.go b/controllers/helmrelease_controller.go → ...nal/controllers/helmrelease_controller.go
diff --git a/controllers/helmrelease_controller_chart.go → ...ntrollers/helmrelease_controller_chart.go b/controllers/helmrelease_controller_chart.go → ...ntrollers/helmrelease_controller_chart.go
diff --git a/...lers/helmrelease_controller_chart_test.go → ...lers/helmrelease_controller_chart_test.go b/...lers/helmrelease_controller_chart_test.go → ...lers/helmrelease_controller_chart_test.go
diff --git a/...llers/helmrelease_controller_fuzz_test.go → ...llers/helmrelease_controller_fuzz_test.go b/...llers/helmrelease_controller_fuzz_test.go → ...llers/helmrelease_controller_fuzz_test.go
diff --git a/controllers/helmrelease_controller_test.go → ...ontrollers/helmrelease_controller_test.go b/controllers/helmrelease_controller_test.go → ...ontrollers/helmrelease_controller_test.go
diff --git a/controllers/source_predicate.go → internal/controllers/source_predicate.go b/controllers/source_predicate.go → internal/controllers/source_predicate.go
diff --git a/controllers/suite_test.go → internal/controllers/suite_test.go b/controllers/suite_test.go → internal/controllers/suite_test.go
@@ -38,7 +38,7 @@ var testEnv *envtest.Environment
 
 func TestMain(m *testing.M) {
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
+		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
 	}
 
 	var err error

diff --git a/main.go b/main.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"fmt"
-	"github.com/fluxcd/helm-controller/internal/oomwatch"
 	"os"
 	"time"
 
@@ -46,9 +45,10 @@ import (
 	corev1 "k8s.io/api/core/v1"
 
 	v2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/helm-controller/controllers"
+	"github.com/fluxcd/helm-controller/internal/controllers"
 	"github.com/fluxcd/helm-controller/internal/features"
 	intkube "github.com/fluxcd/helm-controller/internal/kube"
+	"github.com/fluxcd/helm-controller/internal/oomwatch"
 	feathelper "github.com/fluxcd/pkg/runtime/features"
 	// +kubebuilder:scaffold:imports
 )