diff --git a/Dockerfile b/Dockerfile index c44b9c766..05e4bf028 100644 --- 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 b/internal/controllers/helmrelease_controller.go similarity index 100% rename from controllers/helmrelease_controller.go rename to internal/controllers/helmrelease_controller.go diff --git a/controllers/helmrelease_controller_chart.go b/internal/controllers/helmrelease_controller_chart.go similarity index 100% rename from controllers/helmrelease_controller_chart.go rename to internal/controllers/helmrelease_controller_chart.go diff --git a/controllers/helmrelease_controller_chart_test.go b/internal/controllers/helmrelease_controller_chart_test.go similarity index 100% rename from controllers/helmrelease_controller_chart_test.go rename to internal/controllers/helmrelease_controller_chart_test.go diff --git a/controllers/helmrelease_controller_fuzz_test.go b/internal/controllers/helmrelease_controller_fuzz_test.go similarity index 100% rename from controllers/helmrelease_controller_fuzz_test.go rename to internal/controllers/helmrelease_controller_fuzz_test.go diff --git a/controllers/helmrelease_controller_test.go b/internal/controllers/helmrelease_controller_test.go similarity index 100% rename from controllers/helmrelease_controller_test.go rename to internal/controllers/helmrelease_controller_test.go diff --git a/controllers/source_predicate.go b/internal/controllers/source_predicate.go similarity index 100% rename from controllers/source_predicate.go rename to internal/controllers/source_predicate.go diff --git a/controllers/suite_test.go b/internal/controllers/suite_test.go similarity index 100% rename from controllers/suite_test.go rename to internal/controllers/suite_test.go diff --git a/main.go b/main.go index affb02e26..1cd6d7fb8 100644 --- 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 )