Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move controllers to internal/controllers #653

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Move controllers to internal/controllers #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 controllers/helmrelease_controller.go → ...nal/controllers/helmrelease_controller.go
View file
Open in desktop
File renamed without changes.
0 controllers/helmrelease_controller_chart.go → ...ntrollers/helmrelease_controller_chart.go
View file
Open in desktop
File renamed without changes.
0 ...lers/helmrelease_controller_chart_test.go → ...lers/helmrelease_controller_chart_test.go
View file
Open in desktop
File renamed without changes.
0 ...llers/helmrelease_controller_fuzz_test.go → ...llers/helmrelease_controller_fuzz_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/helmrelease_controller_test.go → ...ontrollers/helmrelease_controller_test.go
View file
Open in desktop
File renamed without changes.
0 controllers/source_predicate.go → internal/controllers/source_predicate.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion controllers/suite_test.go → internal/controllers/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package main

import (
"fmt"
"github.com/fluxcd/helm-controller/internal/oomwatch"
"os"
"time"

Expand Down Expand Up @@ -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
)
Expand Down