From 3615feef2a772fd5d89489121081bd25aedad471 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Mon, 27 Mar 2023 16:23:31 +0200 Subject: [PATCH] Move `controllers` to `internal/controllers` There is no good reason for it to be exposed and available through a public API, and this follows the new kubebuilder defaults. Signed-off-by: Hidde Beydals --- Dockerfile | 1 - .../controllers}/helmrelease_controller.go | 0 .../controllers}/helmrelease_controller_chart.go | 0 .../controllers}/helmrelease_controller_chart_test.go | 0 .../controllers}/helmrelease_controller_fuzz_test.go | 0 .../controllers}/helmrelease_controller_test.go | 0 {controllers => internal/controllers}/source_predicate.go | 0 {controllers => internal/controllers}/suite_test.go | 2 +- main.go | 4 ++-- 9 files changed, 3 insertions(+), 4 deletions(-) rename {controllers => internal/controllers}/helmrelease_controller.go (100%) rename {controllers => internal/controllers}/helmrelease_controller_chart.go (100%) rename {controllers => internal/controllers}/helmrelease_controller_chart_test.go (100%) rename {controllers => internal/controllers}/helmrelease_controller_fuzz_test.go (100%) rename {controllers => internal/controllers}/helmrelease_controller_test.go (100%) rename {controllers => internal/controllers}/source_predicate.go (100%) rename {controllers => internal/controllers}/suite_test.go (94%) 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 94% rename from controllers/suite_test.go rename to internal/controllers/suite_test.go index 77be7fa2d..d55a33452 100644 --- a/controllers/suite_test.go +++ b/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 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 )