Skip to content

Commit 3615fee

Browse files
committed
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 <[email protected]>
1 parent 4ad3b21 commit 3615fee

9 files changed

+3
-4
lines changed

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ RUN go mod download
2525

2626
# copy source code
2727
COPY main.go main.go
28-
COPY controllers/ controllers/
2928
COPY internal/ internal/
3029

3130
# build without specifing the arch

controllers/suite_test.go renamed to internal/controllers/suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var testEnv *envtest.Environment
3838

3939
func TestMain(m *testing.M) {
4040
testEnv = &envtest.Environment{
41-
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
41+
CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
4242
}
4343

4444
var err error

main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package main
1818

1919
import (
2020
"fmt"
21-
"github.com/fluxcd/helm-controller/internal/oomwatch"
2221
"os"
2322
"time"
2423

@@ -46,9 +45,10 @@ import (
4645
corev1 "k8s.io/api/core/v1"
4746

4847
v2 "github.com/fluxcd/helm-controller/api/v2beta1"
49-
"github.com/fluxcd/helm-controller/controllers"
48+
"github.com/fluxcd/helm-controller/internal/controllers"
5049
"github.com/fluxcd/helm-controller/internal/features"
5150
intkube "github.com/fluxcd/helm-controller/internal/kube"
51+
"github.com/fluxcd/helm-controller/internal/oomwatch"
5252
feathelper "github.com/fluxcd/pkg/runtime/features"
5353
// +kubebuilder:scaffold:imports
5454
)

0 commit comments

Comments
 (0)