Merge pull request #653 from fluxcd/internal-controllers

Move `controllers` to `internal/controllers`

Author: hiddeco

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

controllers/helmrelease_controller.go renamed to internal/controllers/helmrelease_controller.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

controllers/helmrelease_controller_chart.go renamed to internal/controllers/helmrelease_controller_chart.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
 )