Skip to content

Commit ee1aacf

Browse files
committed
[chore] move controllers under internal
1 parent 1a0a729 commit ee1aacf

16 files changed

+6
-6
lines changed
File renamed without changes.
File renamed without changes.

controllers/opampbridge_controller_test.go internal/controllers/opampbridge_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ import (
3434
k8sreconcile "sigs.k8s.io/controller-runtime/pkg/reconcile"
3535

3636
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
37-
"github.com/open-telemetry/opentelemetry-operator/controllers"
3837
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
3938
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
4039
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/rbac"
4140
"github.com/open-telemetry/opentelemetry-operator/internal/config"
41+
"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
4242
)
4343

4444
var opampBridgeLogger = logf.Log.WithName("opamp-bridge-controller-unit-tests")

controllers/reconcile_test.go internal/controllers/reconcile_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ import (
4949

5050
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
5151
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
52-
"github.com/open-telemetry/opentelemetry-operator/controllers"
5352
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
5453
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
5554
autoRBAC "github.com/open-telemetry/opentelemetry-operator/internal/autodetect/rbac"
5655
"github.com/open-telemetry/opentelemetry-operator/internal/config"
56+
"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
5757
"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
5858
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
5959
"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"

controllers/suite_test.go internal/controllers/suite_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,10 @@ func TestMain(m *testing.M) {
160160
utilruntime.Must(v1beta1.AddToScheme(testScheme))
161161

162162
testEnv = &envtest.Environment{
163-
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
163+
CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
164164
CRDs: []*apiextensionsv1.CustomResourceDefinition{testdata.OpenShiftRouteCRD, testdata.ServiceMonitorCRD, testdata.PodMonitorCRD},
165165
WebhookInstallOptions: envtest.WebhookInstallOptions{
166-
Paths: []string{filepath.Join("..", "config", "webhook")},
166+
Paths: []string{filepath.Join("..", "..", "config", "webhook")},
167167
},
168168
}
169169
restCfg, err = testEnv.Start()

controllers/targetallocator_controller_test.go internal/controllers/targetallocator_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232

3333
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
3434
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
35-
"github.com/open-telemetry/opentelemetry-operator/controllers"
3635
"github.com/open-telemetry/opentelemetry-operator/internal/config"
36+
"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
3737
)
3838

3939
var testLogger = logf.Log.WithName("opamp-bridge-controller-unit-tests")
File renamed without changes.

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ import (
4949

5050
otelv1alpha1 "github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
5151
otelv1beta1 "github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
52-
"github.com/open-telemetry/opentelemetry-operator/controllers"
5352
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect"
5453
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/certmanager"
5554
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
5655
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
5756
"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/targetallocator"
5857
"github.com/open-telemetry/opentelemetry-operator/internal/config"
58+
"github.com/open-telemetry/opentelemetry-operator/internal/controllers"
5959
"github.com/open-telemetry/opentelemetry-operator/internal/fips"
6060
collectorManifests "github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
6161
openshiftDashboards "github.com/open-telemetry/opentelemetry-operator/internal/openshift/dashboards"

0 commit comments

Comments
 (0)