[chore] move controllers under internal

open-telemetry · Jan 24, 2025 · e9c6a0a · e9c6a0a
1 parent 1a0a729
commit e9c6a0a
Show file tree

Hide file tree

Showing 16 changed files with 6 additions and 6 deletions.
diff --git a/controllers/builder_test.go → internal/controllers/builder_test.go b/controllers/builder_test.go → internal/controllers/builder_test.go
diff --git a/controllers/common.go → internal/controllers/common.go b/controllers/common.go → internal/controllers/common.go
diff --git a/controllers/opampbridge_controller.go → ...nal/controllers/opampbridge_controller.go b/controllers/opampbridge_controller.go → ...nal/controllers/opampbridge_controller.go
diff --git a/controllers/opampbridge_controller_test.go → ...ontrollers/opampbridge_controller_test.go b/controllers/opampbridge_controller_test.go → ...ontrollers/opampbridge_controller_test.go
@@ -34,11 +34,11 @@ import (
 	k8sreconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
-	"github.com/open-telemetry/opentelemetry-operator/controllers"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/rbac"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
+	"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
 )
 
 var opampBridgeLogger = logf.Log.WithName("opamp-bridge-controller-unit-tests")

diff --git a/...lers/opentelemetrycollector_controller.go → ...lers/opentelemetrycollector_controller.go b/...lers/opentelemetrycollector_controller.go → ...lers/opentelemetrycollector_controller.go
diff --git a/...opentelemetrycollector_reconciler_test.go → ...opentelemetrycollector_reconciler_test.go b/...opentelemetrycollector_reconciler_test.go → ...opentelemetrycollector_reconciler_test.go
diff --git a/controllers/reconcile_test.go → internal/controllers/reconcile_test.go b/controllers/reconcile_test.go → internal/controllers/reconcile_test.go
@@ -49,11 +49,11 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
-	"github.com/open-telemetry/opentelemetry-operator/controllers"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
 	autoRBAC "github.com/open-telemetry/opentelemetry-operator/internal/autodetect/rbac"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
+	"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
 	"github.com/open-telemetry/opentelemetry-operator/internal/naming"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"

diff --git a/controllers/suite_test.go → internal/controllers/suite_test.go b/controllers/suite_test.go → internal/controllers/suite_test.go
@@ -160,10 +160,10 @@ func TestMain(m *testing.M) {
 	utilruntime.Must(v1beta1.AddToScheme(testScheme))
 
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
+		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
 		CRDs:              []*apiextensionsv1.CustomResourceDefinition{testdata.OpenShiftRouteCRD, testdata.ServiceMonitorCRD, testdata.PodMonitorCRD},
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "config", "webhook")},
+			Paths: []string{filepath.Join("..", "..", "config", "webhook")},
 		},
 	}
 	restCfg, err = testEnv.Start()

diff --git a/controllers/targetallocator_controller.go → ...controllers/targetallocator_controller.go b/controllers/targetallocator_controller.go → ...controllers/targetallocator_controller.go
diff --git a/...ollers/targetallocator_controller_test.go → ...ollers/targetallocator_controller_test.go b/...ollers/targetallocator_controller_test.go → ...ollers/targetallocator_controller_test.go
@@ -32,8 +32,8 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
-	"github.com/open-telemetry/opentelemetry-operator/controllers"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
+	"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
 )
 
 var testLogger = logf.Log.WithName("opamp-bridge-controller-unit-tests")

diff --git a/...ollers/targetallocator_reconciler_test.go → ...ollers/targetallocator_reconciler_test.go b/...ollers/targetallocator_reconciler_test.go → ...ollers/targetallocator_reconciler_test.go
diff --git a/controllers/testdata/ingress_testdata.yaml → ...ontrollers/testdata/ingress_testdata.yaml b/controllers/testdata/ingress_testdata.yaml → ...ontrollers/testdata/ingress_testdata.yaml
diff --git a/controllers/testdata/otlp_test.yaml → internal/controllers/testdata/otlp_test.yaml b/controllers/testdata/otlp_test.yaml → internal/controllers/testdata/otlp_test.yaml
diff --git a/controllers/testdata/test.yaml → internal/controllers/testdata/test.yaml b/controllers/testdata/test.yaml → internal/controllers/testdata/test.yaml
diff --git a/controllers/testdata/test_ta_update.yaml → .../controllers/testdata/test_ta_update.yaml b/controllers/testdata/test_ta_update.yaml → .../controllers/testdata/test_ta_update.yaml
diff --git a/main.go b/main.go
@@ -49,13 +49,13 @@ import (
 
 	otelv1alpha1 "github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
 	otelv1beta1 "github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
-	"github.com/open-telemetry/opentelemetry-operator/controllers"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/certmanager"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/targetallocator"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
+	"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
 	"github.com/open-telemetry/opentelemetry-operator/internal/fips"
 	collectorManifests "github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
 	openshiftDashboards "github.com/open-telemetry/opentelemetry-operator/internal/openshift/dashboards"