Skip to content

Commit

Permalink
Move controllers module under internal
Browse files Browse the repository at this point in the history 
...to conform to the standard Go project layout:
https://github.com/golang-standards/project-layout?tab=readme-ov-file#internal

Signed-off-by: Tom Pantelis <[email protected]>
  • Loading branch information
@tpantelis
tpantelis committed Dec 9, 2024
1 parent 9e50aff commit 44f749c
Show file tree
Hide file tree
Showing 30 changed files with 28 additions and 28 deletions.
6 changes: 3 additions & 3 deletions cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/submariner-io/admiral/pkg/names"
admversion "github.com/submariner-io/admiral/pkg/version"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/metrics"
"github.com/submariner-io/submariner-operator/controllers/servicediscovery"
"github.com/submariner-io/submariner-operator/controllers/submariner"
"github.com/submariner-io/submariner-operator/internal/controllers/metrics"
"github.com/submariner-io/submariner-operator/internal/controllers/servicediscovery"
"github.com/submariner-io/submariner-operator/internal/controllers/submariner"
"github.com/submariner-io/submariner-operator/pkg/crd"
"github.com/submariner-io/submariner-operator/pkg/gateway"
"github.com/submariner-io/submariner-operator/pkg/lighthouse"
Expand Down
0 controllers/apply/apply.go → internal/controllers/apply/apply.go
View file
File renamed without changes.
0 controllers/apply/apply_suite_test.go → ...nal/controllers/apply/apply_suite_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion controllers/apply/apply_test.go → internal/controllers/apply/apply_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/submariner-io/admiral/pkg/fake"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controllers/metrics/metrics.go → internal/controllers/metrics/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"errors"

"github.com/go-logr/logr"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
"github.com/submariner-io/submariner-operator/pkg/metrics"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion controllers/servicediscovery/cleanup.go → ...l/controllers/servicediscovery/cleanup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/submariner-io/admiral/pkg/resource"
"github.com/submariner-io/admiral/pkg/util"
operatorv1alpha1 "github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/uninstall"
"github.com/submariner-io/submariner-operator/internal/controllers/uninstall"
"github.com/submariner-io/submariner-operator/pkg/images"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
appsv1 "k8s.io/api/apps/v1"
Expand Down
0 ...ediscovery/core_dns_port_internal_test.go → ...ediscovery/core_dns_port_internal_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ediscovery/servicediscovery_controller.go → ...ediscovery/servicediscovery_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import (
"github.com/submariner-io/admiral/pkg/syncer/broker"
"github.com/submariner-io/admiral/pkg/util"
submarinerv1alpha1 "github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/controllers/metrics"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/metrics"
"github.com/submariner-io/submariner-operator/pkg/httpproxy"
"github.com/submariner-io/submariner-operator/pkg/images"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
Expand Down
2 changes: 1 addition & 1 deletion ...overy/servicediscovery_controller_test.go → ...overy/servicediscovery_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
. "github.com/onsi/gomega"
"github.com/submariner-io/admiral/pkg/names"
submariner_v1 "github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/servicediscovery"
"github.com/submariner-io/submariner-operator/internal/controllers/servicediscovery"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions ...ediscovery/servicediscovery_suite_test.go → ...ediscovery/servicediscovery_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"github.com/submariner-io/admiral/pkg/log/kzerolog"
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/servicediscovery"
"github.com/submariner-io/submariner-operator/controllers/test"
"github.com/submariner-io/submariner-operator/internal/controllers/servicediscovery"
"github.com/submariner-io/submariner-operator/internal/controllers/test"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
0 controllers/submariner/broker_controller.go → ...ntrollers/submariner/broker_controller.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...lers/submariner/broker_controller_test.go → ...lers/submariner/broker_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
submarinerController "github.com/submariner-io/submariner-operator/controllers/submariner"
"github.com/submariner-io/submariner-operator/controllers/test"
submarinerController "github.com/submariner-io/submariner-operator/internal/controllers/submariner"
"github.com/submariner-io/submariner-operator/internal/controllers/test"
"github.com/submariner-io/submariner-operator/pkg/discovery/globalnet"
apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/submariner/cleanup.go → internal/controllers/submariner/cleanup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/admiral/pkg/resource"
operatorv1alpha1 "github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/uninstall"
"github.com/submariner-io/submariner-operator/internal/controllers/uninstall"
"github.com/submariner-io/submariner-operator/pkg/images"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
appsv1 "k8s.io/api/apps/v1"
Expand Down
0 controllers/submariner/daemonsets.go → ...rnal/controllers/submariner/daemonsets.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions controllers/submariner/gateway_resources.go → ...ntrollers/submariner/gateway_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/admiral/pkg/syncer/broker"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/controllers/metrics"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/metrics"
"github.com/submariner-io/submariner-operator/pkg/httpproxy"
"github.com/submariner-io/submariner-operator/pkg/images"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
Expand Down
4 changes: 2 additions & 2 deletions ...rollers/submariner/globalnet_resources.go → ...rollers/submariner/globalnet_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/go-logr/logr"
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/controllers/metrics"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/metrics"
"github.com/submariner-io/submariner-operator/pkg/httpproxy"
"github.com/submariner-io/submariner-operator/pkg/images"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
Expand Down
2 changes: 1 addition & 1 deletion ...lers/submariner/loadbalancer_resources.go → ...lers/submariner/loadbalancer_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/admiral/pkg/resource"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
submv1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1"
"github.com/submariner-io/submariner/pkg/port"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion ...ers/submariner/metrics_proxy_resources.go → ...ers/submariner/metrics_proxy_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/go-logr/logr"
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
"github.com/submariner-io/submariner-operator/pkg/httpproxy"
"github.com/submariner-io/submariner-operator/pkg/images"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
Expand Down
2 changes: 1 addition & 1 deletion controllers/submariner/migration_test.go → .../controllers/submariner/migration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package submariner_test

import (
. "github.com/onsi/ginkgo/v2"
"github.com/submariner-io/submariner-operator/controllers/submariner"
"github.com/submariner-io/submariner-operator/internal/controllers/submariner"
"github.com/submariner-io/submariner/pkg/cni"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
Expand Down
0 ...rollers/submariner/np_syncer_resources.go → ...rollers/submariner/np_syncer_resources.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...llers/submariner/route_agent_resources.go → ...llers/submariner/route_agent_resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/go-logr/logr"
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/apply"
"github.com/submariner-io/submariner-operator/internal/controllers/apply"
"github.com/submariner-io/submariner-operator/pkg/httpproxy"
"github.com/submariner-io/submariner-operator/pkg/images"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
Expand Down
0 .../submariner/servicediscovery_resources.go → .../submariner/servicediscovery_resources.go
View file
File renamed without changes.
0 ...llers/submariner/submariner_controller.go → ...llers/submariner/submariner_controller.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions .../submariner/submariner_controller_test.go → .../submariner/submariner_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
syncertest "github.com/submariner-io/admiral/pkg/syncer/test"
testutil "github.com/submariner-io/admiral/pkg/test"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/test"
"github.com/submariner-io/submariner-operator/controllers/uninstall"
"github.com/submariner-io/submariner-operator/internal/controllers/test"
"github.com/submariner-io/submariner-operator/internal/controllers/uninstall"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
"github.com/submariner-io/submariner/pkg/cni"
appsv1 "k8s.io/api/apps/v1"
Expand Down
0 controllers/submariner/submariner_metrics.go → ...trollers/submariner/submariner_metrics.go
View file
File renamed without changes.
0 ...submariner/submariner_networkdiscovery.go → ...submariner/submariner_networkdiscovery.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...llers/submariner/submariner_suite_test.go → ...llers/submariner/submariner_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/submariner-io/admiral/pkg/names"
"github.com/submariner-io/admiral/pkg/syncer/broker"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
submarinerController "github.com/submariner-io/submariner-operator/controllers/submariner"
"github.com/submariner-io/submariner-operator/controllers/test"
submarinerController "github.com/submariner-io/submariner-operator/internal/controllers/submariner"
"github.com/submariner-io/submariner-operator/internal/controllers/test"
"github.com/submariner-io/submariner-operator/pkg/discovery/network"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
submarinerv1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1"
Expand Down
2 changes: 1 addition & 1 deletion controllers/test/driver.go → internal/controllers/test/driver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/submariner-io/admiral/pkg/syncer/test"
admtest "github.com/submariner-io/admiral/pkg/test"
"github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/uninstall"
"github.com/submariner-io/submariner-operator/internal/controllers/uninstall"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
0 controllers/uninstall/uninstall.go → internal/controllers/uninstall/uninstall.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion test/e2e/cleanup/submariner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"github.com/submariner-io/admiral/pkg/watcher"
"github.com/submariner-io/shipyard/test/e2e/framework"
operatorv1alpha1 "github.com/submariner-io/submariner-operator/api/v1alpha1"
"github.com/submariner-io/submariner-operator/controllers/uninstall"
"github.com/submariner-io/submariner-operator/internal/controllers/uninstall"
opnames "github.com/submariner-io/submariner-operator/pkg/names"
submarinerclientset "github.com/submariner-io/submariner/pkg/client/clientset/versioned"
corev1 "k8s.io/api/core/v1"
Expand Down

0 comments on commit 44f749c

Please sign in to comment.