diff --git a/cmd/main.go b/cmd/main.go index b64e76f3..50bbb332 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -40,13 +40,13 @@ import ( "github.com/dash0hq/dash0-operator/images/pkg/common" "github.com/dash0hq/dash0-operator/internal/backendconnection" "github.com/dash0hq/dash0-operator/internal/backendconnection/otelcolresources" - "github.com/dash0hq/dash0-operator/internal/dash0/controller" - "github.com/dash0hq/dash0-operator/internal/dash0/instrumentation" - "github.com/dash0hq/dash0-operator/internal/dash0/predelete" - "github.com/dash0hq/dash0-operator/internal/dash0/selfmonitoringapiaccess" - "github.com/dash0hq/dash0-operator/internal/dash0/startup" - "github.com/dash0hq/dash0-operator/internal/dash0/util" - "github.com/dash0hq/dash0-operator/internal/dash0/webhooks" + "github.com/dash0hq/dash0-operator/internal/controller" + "github.com/dash0hq/dash0-operator/internal/instrumentation" + "github.com/dash0hq/dash0-operator/internal/predelete" + "github.com/dash0hq/dash0-operator/internal/selfmonitoringapiaccess" + "github.com/dash0hq/dash0-operator/internal/startup" + "github.com/dash0hq/dash0-operator/internal/util" + "github.com/dash0hq/dash0-operator/internal/webhooks" //+kubebuilder:scaffold:imports ) diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 2f8922aa..5d667982 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -1,5 +1,5 @@ # Note: The kustomize configs are not used in production, but they are currently still used when setting up the unit -# test environment, like in internal/dash0/webhooks/webhook_suite_test.go -> &envtest.Environment#WebhookInstallOptions. +# test environment, like in internal/webhooks/webhook_suite_test.go -> &envtest.Environment#WebhookInstallOptions. # Thus, they need to be kept in sync with the webhook resources defined in # helm-chart/dash0-operator/templates/operator/deployment-and-webhooks.yaml. --- diff --git a/internal/backendconnection/backend_connection_controller.go b/internal/backendconnection/backend_connection_controller.go index 459aacda..bf0cf846 100644 --- a/internal/backendconnection/backend_connection_controller.go +++ b/internal/backendconnection/backend_connection_controller.go @@ -22,7 +22,7 @@ import ( dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" "github.com/dash0hq/dash0-operator/internal/backendconnection/otelcolresources" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type BackendConnectionReconciler struct { diff --git a/internal/backendconnection/backendconnection_manager.go b/internal/backendconnection/backendconnection_manager.go index 769cac64..ca17a219 100644 --- a/internal/backendconnection/backendconnection_manager.go +++ b/internal/backendconnection/backendconnection_manager.go @@ -14,7 +14,7 @@ import ( dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" "github.com/dash0hq/dash0-operator/internal/backendconnection/otelcolresources" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type BackendConnectionManager struct { diff --git a/internal/backendconnection/otelcolresources/collector_config_maps.go b/internal/backendconnection/otelcolresources/collector_config_maps.go index 596f42f5..36f4cbf1 100644 --- a/internal/backendconnection/otelcolresources/collector_config_maps.go +++ b/internal/backendconnection/otelcolresources/collector_config_maps.go @@ -13,7 +13,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type OtlpExporter struct { diff --git a/internal/backendconnection/otelcolresources/collector_config_maps_test.go b/internal/backendconnection/otelcolresources/collector_config_maps_test.go index eafa62f3..16e3db78 100644 --- a/internal/backendconnection/otelcolresources/collector_config_maps_test.go +++ b/internal/backendconnection/otelcolresources/collector_config_maps_test.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/backendconnection/otelcolresources/desired_state.go b/internal/backendconnection/otelcolresources/desired_state.go index 4f7769e6..b8746e18 100644 --- a/internal/backendconnection/otelcolresources/desired_state.go +++ b/internal/backendconnection/otelcolresources/desired_state.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/selfmonitoringapiaccess" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/selfmonitoringapiaccess" + "github.com/dash0hq/dash0-operator/internal/util" ) type oTelColConfig struct { diff --git a/internal/backendconnection/otelcolresources/desired_state_test.go b/internal/backendconnection/otelcolresources/desired_state_test.go index fe1a83be..a7bbc618 100644 --- a/internal/backendconnection/otelcolresources/desired_state_test.go +++ b/internal/backendconnection/otelcolresources/desired_state_test.go @@ -11,8 +11,8 @@ import ( corev1 "k8s.io/api/core/v1" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/selfmonitoringapiaccess" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/selfmonitoringapiaccess" + "github.com/dash0hq/dash0-operator/internal/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/backendconnection/otelcolresources/otelcol_resources.go b/internal/backendconnection/otelcolresources/otelcol_resources.go index 9e4bf159..ba6fb780 100644 --- a/internal/backendconnection/otelcolresources/otelcol_resources.go +++ b/internal/backendconnection/otelcolresources/otelcol_resources.go @@ -24,8 +24,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/selfmonitoringapiaccess" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/selfmonitoringapiaccess" + "github.com/dash0hq/dash0-operator/internal/util" ) type OTelColResourceManager struct { diff --git a/internal/dash0/controller/controller_suite_test.go b/internal/controller/controller_suite_test.go similarity index 93% rename from internal/dash0/controller/controller_suite_test.go rename to internal/controller/controller_suite_test.go index 2bb8fa82..c0e6bec2 100644 --- a/internal/dash0/controller/controller_suite_test.go +++ b/internal/controller/controller_suite_test.go @@ -55,9 +55,9 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")}, ErrorIfCRDPathMissing: true, - BinaryAssetsDirectory: filepath.Join("..", "..", "..", "bin", "k8s", + BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", fmt.Sprintf("1.28.3-%s-%s", runtime.GOOS, runtime.GOARCH)), } diff --git a/internal/dash0/controller/dash0_controller.go b/internal/controller/dash0_controller.go similarity index 99% rename from internal/dash0/controller/dash0_controller.go rename to internal/controller/dash0_controller.go index db4a15ad..ded77ed3 100644 --- a/internal/dash0/controller/dash0_controller.go +++ b/internal/controller/dash0_controller.go @@ -21,8 +21,8 @@ import ( dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" "github.com/dash0hq/dash0-operator/internal/backendconnection" - "github.com/dash0hq/dash0-operator/internal/dash0/instrumentation" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/instrumentation" + "github.com/dash0hq/dash0-operator/internal/util" ) type Dash0Reconciler struct { diff --git a/internal/dash0/controller/dash0_controller_test.go b/internal/controller/dash0_controller_test.go similarity index 99% rename from internal/dash0/controller/dash0_controller_test.go rename to internal/controller/dash0_controller_test.go index 96cd48bd..5e909d14 100644 --- a/internal/dash0/controller/dash0_controller_test.go +++ b/internal/controller/dash0_controller_test.go @@ -25,7 +25,7 @@ import ( dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" "github.com/dash0hq/dash0-operator/internal/backendconnection" "github.com/dash0hq/dash0-operator/internal/backendconnection/otelcolresources" - "github.com/dash0hq/dash0-operator/internal/dash0/instrumentation" + "github.com/dash0hq/dash0-operator/internal/instrumentation" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/dash0/controller/operator_configuration_controller.go b/internal/controller/operator_configuration_controller.go similarity index 98% rename from internal/dash0/controller/operator_configuration_controller.go rename to internal/controller/operator_configuration_controller.go index be2c2adc..3c9cbf85 100644 --- a/internal/dash0/controller/operator_configuration_controller.go +++ b/internal/controller/operator_configuration_controller.go @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/selfmonitoringapiaccess" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/selfmonitoringapiaccess" + "github.com/dash0hq/dash0-operator/internal/util" ) type OperatorConfigurationReconciler struct { diff --git a/internal/dash0/controller/operator_configuration_controller_test.go b/internal/controller/operator_configuration_controller_test.go similarity index 99% rename from internal/dash0/controller/operator_configuration_controller_test.go rename to internal/controller/operator_configuration_controller_test.go index ff55d01b..75ca7158 100644 --- a/internal/dash0/controller/operator_configuration_controller_test.go +++ b/internal/controller/operator_configuration_controller_test.go @@ -18,8 +18,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/selfmonitoringapiaccess" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/selfmonitoringapiaccess" + "github.com/dash0hq/dash0-operator/internal/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/dash0/controller/perses_dashboards_controller.go b/internal/controller/perses_dashboards_controller.go similarity index 99% rename from internal/dash0/controller/perses_dashboards_controller.go rename to internal/controller/perses_dashboards_controller.go index a37d5aef..7c3f8993 100644 --- a/internal/dash0/controller/perses_dashboards_controller.go +++ b/internal/controller/perses_dashboards_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type PersesDashboardCrdReconciler struct { diff --git a/internal/dash0/controller/perses_dashboards_controller_test.go b/internal/controller/perses_dashboards_controller_test.go similarity index 100% rename from internal/dash0/controller/perses_dashboards_controller_test.go rename to internal/controller/perses_dashboards_controller_test.go diff --git a/internal/dash0/controller/prometheus_rules_controller.go b/internal/controller/prometheus_rules_controller.go similarity index 99% rename from internal/dash0/controller/prometheus_rules_controller.go rename to internal/controller/prometheus_rules_controller.go index 493d3c5a..c98a9b0c 100644 --- a/internal/dash0/controller/prometheus_rules_controller.go +++ b/internal/controller/prometheus_rules_controller.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/yaml" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type PrometheusRuleCrdReconciler struct { diff --git a/internal/dash0/controller/prometheus_rules_controller_test.go b/internal/controller/prometheus_rules_controller_test.go similarity index 100% rename from internal/dash0/controller/prometheus_rules_controller_test.go rename to internal/controller/prometheus_rules_controller_test.go diff --git a/internal/dash0/controller/third_party_crd_common.go b/internal/controller/third_party_crd_common.go similarity index 99% rename from internal/dash0/controller/third_party_crd_common.go rename to internal/controller/third_party_crd_common.go index fe95577e..2f2fb97b 100644 --- a/internal/dash0/controller/third_party_crd_common.go +++ b/internal/controller/third_party_crd_common.go @@ -31,7 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type ApiClient interface { diff --git a/internal/dash0/instrumentation/instrumentable_workloads.go b/internal/instrumentation/instrumentable_workloads.go similarity index 98% rename from internal/dash0/instrumentation/instrumentable_workloads.go rename to internal/instrumentation/instrumentable_workloads.go index b8ac01e2..7800de99 100644 --- a/internal/dash0/instrumentation/instrumentable_workloads.go +++ b/internal/instrumentation/instrumentable_workloads.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type instrumentableWorkload interface { diff --git a/internal/dash0/instrumentation/instrumentation_suite_test.go b/internal/instrumentation/instrumentation_suite_test.go similarity index 92% rename from internal/dash0/instrumentation/instrumentation_suite_test.go rename to internal/instrumentation/instrumentation_suite_test.go index f8627474..e7aba3ac 100644 --- a/internal/dash0/instrumentation/instrumentation_suite_test.go +++ b/internal/instrumentation/instrumentation_suite_test.go @@ -46,9 +46,9 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")}, ErrorIfCRDPathMissing: true, - BinaryAssetsDirectory: filepath.Join("..", "..", "..", "bin", "k8s", + BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", fmt.Sprintf("1.28.3-%s-%s", runtime.GOOS, runtime.GOARCH)), } diff --git a/internal/dash0/instrumentation/instrumenter.go b/internal/instrumentation/instrumenter.go similarity index 99% rename from internal/dash0/instrumentation/instrumenter.go rename to internal/instrumentation/instrumenter.go index 50f66f6e..a1dd259b 100644 --- a/internal/dash0/instrumentation/instrumenter.go +++ b/internal/instrumentation/instrumenter.go @@ -21,8 +21,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" - "github.com/dash0hq/dash0-operator/internal/dash0/workloads" + "github.com/dash0hq/dash0-operator/internal/util" + "github.com/dash0hq/dash0-operator/internal/workloads" ) type Instrumenter struct { diff --git a/internal/dash0/instrumentation/instrumenter_test.go b/internal/instrumentation/instrumenter_test.go similarity index 100% rename from internal/dash0/instrumentation/instrumenter_test.go rename to internal/instrumentation/instrumenter_test.go diff --git a/internal/dash0/predelete/operator_pre_delete_handler.go b/internal/predelete/operator_pre_delete_handler.go similarity index 100% rename from internal/dash0/predelete/operator_pre_delete_handler.go rename to internal/predelete/operator_pre_delete_handler.go diff --git a/internal/dash0/predelete/operator_pre_delete_handler_test.go b/internal/predelete/operator_pre_delete_handler_test.go similarity index 98% rename from internal/dash0/predelete/operator_pre_delete_handler_test.go rename to internal/predelete/operator_pre_delete_handler_test.go index a854aeec..cb51e595 100644 --- a/internal/dash0/predelete/operator_pre_delete_handler_test.go +++ b/internal/predelete/operator_pre_delete_handler_test.go @@ -13,7 +13,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/dash0hq/dash0-operator/internal/dash0/controller" + "github.com/dash0hq/dash0-operator/internal/controller" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/dash0/predelete/pre_delete_suite_test.go b/internal/predelete/pre_delete_suite_test.go similarity index 92% rename from internal/dash0/predelete/pre_delete_suite_test.go rename to internal/predelete/pre_delete_suite_test.go index a69b78d5..b9bd1879 100644 --- a/internal/dash0/predelete/pre_delete_suite_test.go +++ b/internal/predelete/pre_delete_suite_test.go @@ -22,8 +22,8 @@ import ( dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" "github.com/dash0hq/dash0-operator/internal/backendconnection" "github.com/dash0hq/dash0-operator/internal/backendconnection/otelcolresources" - "github.com/dash0hq/dash0-operator/internal/dash0/controller" - "github.com/dash0hq/dash0-operator/internal/dash0/instrumentation" + "github.com/dash0hq/dash0-operator/internal/controller" + "github.com/dash0hq/dash0-operator/internal/instrumentation" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -58,9 +58,9 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")}, ErrorIfCRDPathMissing: true, - BinaryAssetsDirectory: filepath.Join("..", "..", "..", "bin", "k8s", + BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", fmt.Sprintf("1.28.3-%s-%s", runtime.GOOS, runtime.GOARCH)), } diff --git a/internal/dash0/selfmonitoringapiaccess/self_monitoring_and_api_access.go b/internal/selfmonitoringapiaccess/self_monitoring_and_api_access.go similarity index 99% rename from internal/dash0/selfmonitoringapiaccess/self_monitoring_and_api_access.go rename to internal/selfmonitoringapiaccess/self_monitoring_and_api_access.go index fe0c445e..c5e45657 100644 --- a/internal/dash0/selfmonitoringapiaccess/self_monitoring_and_api_access.go +++ b/internal/selfmonitoringapiaccess/self_monitoring_and_api_access.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type OtlpProtocol string diff --git a/internal/dash0/startup/auto_operator_configuration_handler.go b/internal/startup/auto_operator_configuration_handler.go similarity index 99% rename from internal/dash0/startup/auto_operator_configuration_handler.go rename to internal/startup/auto_operator_configuration_handler.go index df86bf28..fb4069e3 100644 --- a/internal/dash0/startup/auto_operator_configuration_handler.go +++ b/internal/startup/auto_operator_configuration_handler.go @@ -17,7 +17,7 @@ import ( dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type SecretRef struct { diff --git a/internal/dash0/startup/auto_operator_configuration_handler_test.go b/internal/startup/auto_operator_configuration_handler_test.go similarity index 100% rename from internal/dash0/startup/auto_operator_configuration_handler_test.go rename to internal/startup/auto_operator_configuration_handler_test.go diff --git a/internal/dash0/startup/startup_suite_test.go b/internal/startup/startup_suite_test.go similarity index 91% rename from internal/dash0/startup/startup_suite_test.go rename to internal/startup/startup_suite_test.go index 05487620..2513aebf 100644 --- a/internal/dash0/startup/startup_suite_test.go +++ b/internal/startup/startup_suite_test.go @@ -44,9 +44,9 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")}, ErrorIfCRDPathMissing: true, - BinaryAssetsDirectory: filepath.Join("..", "..", "..", "bin", "k8s", + BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", fmt.Sprintf("1.28.3-%s-%s", runtime.GOOS, runtime.GOARCH)), } diff --git a/internal/dash0/util/constants.go b/internal/util/constants.go similarity index 100% rename from internal/dash0/util/constants.go rename to internal/util/constants.go diff --git a/internal/dash0/util/controller.go b/internal/util/controller.go similarity index 100% rename from internal/dash0/util/controller.go rename to internal/util/controller.go diff --git a/internal/dash0/util/k8s_events.go b/internal/util/k8s_events.go similarity index 100% rename from internal/dash0/util/k8s_events.go rename to internal/util/k8s_events.go diff --git a/internal/dash0/util/labels.go b/internal/util/labels.go similarity index 100% rename from internal/dash0/util/labels.go rename to internal/util/labels.go diff --git a/internal/dash0/util/labels_test.go b/internal/util/labels_test.go similarity index 100% rename from internal/dash0/util/labels_test.go rename to internal/util/labels_test.go diff --git a/internal/dash0/util/retry.go b/internal/util/retry.go similarity index 100% rename from internal/dash0/util/retry.go rename to internal/util/retry.go diff --git a/internal/dash0/util/types.go b/internal/util/types.go similarity index 100% rename from internal/dash0/util/types.go rename to internal/util/types.go diff --git a/internal/dash0/util/util_suite_test.go b/internal/util/util_suite_test.go similarity index 100% rename from internal/dash0/util/util_suite_test.go rename to internal/util/util_suite_test.go diff --git a/internal/dash0/util/workload_types.go b/internal/util/workload_types.go similarity index 100% rename from internal/dash0/util/workload_types.go rename to internal/util/workload_types.go diff --git a/internal/dash0/webhooks/attach_dangling_events_test.go b/internal/webhooks/attach_dangling_events_test.go similarity index 98% rename from internal/dash0/webhooks/attach_dangling_events_test.go rename to internal/webhooks/attach_dangling_events_test.go index 3bf58813..7e417e5a 100644 --- a/internal/dash0/webhooks/attach_dangling_events_test.go +++ b/internal/webhooks/attach_dangling_events_test.go @@ -18,8 +18,8 @@ import ( dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" "github.com/dash0hq/dash0-operator/internal/backendconnection" "github.com/dash0hq/dash0-operator/internal/backendconnection/otelcolresources" - "github.com/dash0hq/dash0-operator/internal/dash0/controller" - "github.com/dash0hq/dash0-operator/internal/dash0/instrumentation" + "github.com/dash0hq/dash0-operator/internal/controller" + "github.com/dash0hq/dash0-operator/internal/instrumentation" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/dash0/webhooks/instrumentation_webhook.go b/internal/webhooks/instrumentation_webhook.go similarity index 99% rename from internal/dash0/webhooks/instrumentation_webhook.go rename to internal/webhooks/instrumentation_webhook.go index 101fe71e..9930ad5f 100644 --- a/internal/dash0/webhooks/instrumentation_webhook.go +++ b/internal/webhooks/instrumentation_webhook.go @@ -24,8 +24,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook/admission" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" - "github.com/dash0hq/dash0-operator/internal/dash0/workloads" + "github.com/dash0hq/dash0-operator/internal/util" + "github.com/dash0hq/dash0-operator/internal/workloads" ) type InstrumentationWebhookHandler struct { diff --git a/internal/dash0/webhooks/instrumentation_webhook_test.go b/internal/webhooks/instrumentation_webhook_test.go similarity index 100% rename from internal/dash0/webhooks/instrumentation_webhook_test.go rename to internal/webhooks/instrumentation_webhook_test.go diff --git a/internal/dash0/webhooks/monitoring_validation_webhook.go b/internal/webhooks/monitoring_validation_webhook.go similarity index 100% rename from internal/dash0/webhooks/monitoring_validation_webhook.go rename to internal/webhooks/monitoring_validation_webhook.go diff --git a/internal/dash0/webhooks/monitoring_validation_webhook_test.go b/internal/webhooks/monitoring_validation_webhook_test.go similarity index 100% rename from internal/dash0/webhooks/monitoring_validation_webhook_test.go rename to internal/webhooks/monitoring_validation_webhook_test.go diff --git a/internal/dash0/webhooks/operator_configuration_validation_webhook.go b/internal/webhooks/operator_configuration_validation_webhook.go similarity index 100% rename from internal/dash0/webhooks/operator_configuration_validation_webhook.go rename to internal/webhooks/operator_configuration_validation_webhook.go diff --git a/internal/dash0/webhooks/operator_configuration_validation_webhook_test.go b/internal/webhooks/operator_configuration_validation_webhook_test.go similarity index 100% rename from internal/dash0/webhooks/operator_configuration_validation_webhook_test.go rename to internal/webhooks/operator_configuration_validation_webhook_test.go diff --git a/internal/dash0/webhooks/webhook_suite_test.go b/internal/webhooks/webhook_suite_test.go similarity index 94% rename from internal/dash0/webhooks/webhook_suite_test.go rename to internal/webhooks/webhook_suite_test.go index 12b235a8..2fef33d6 100644 --- a/internal/dash0/webhooks/webhook_suite_test.go +++ b/internal/webhooks/webhook_suite_test.go @@ -59,12 +59,12 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")}, ErrorIfCRDPathMissing: false, - BinaryAssetsDirectory: filepath.Join("..", "..", "..", "bin", "k8s", + BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", fmt.Sprintf("1.28.3-%s-%s", runtime.GOOS, runtime.GOARCH)), WebhookInstallOptions: envtest.WebhookInstallOptions{ - Paths: []string{filepath.Join("..", "..", "..", "config", "webhook")}, + Paths: []string{filepath.Join("..", "..", "config", "webhook")}, }, } Expect(testEnv).NotTo(BeNil()) diff --git a/internal/dash0/workloads/workload_modifier.go b/internal/workloads/workload_modifier.go similarity index 99% rename from internal/dash0/workloads/workload_modifier.go rename to internal/workloads/workload_modifier.go index 64db15e7..593e1e5f 100644 --- a/internal/dash0/workloads/workload_modifier.go +++ b/internal/workloads/workload_modifier.go @@ -18,7 +18,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/dash0hq/dash0-operator/internal/backendconnection/otelcolresources" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) const ( diff --git a/internal/dash0/workloads/workload_modifier_test.go b/internal/workloads/workload_modifier_test.go similarity index 99% rename from internal/dash0/workloads/workload_modifier_test.go rename to internal/workloads/workload_modifier_test.go index cfe619a1..2a1f6216 100644 --- a/internal/dash0/workloads/workload_modifier_test.go +++ b/internal/workloads/workload_modifier_test.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" . "github.com/dash0hq/dash0-operator/test/util" ) diff --git a/internal/dash0/workloads/workloads_suite_test.go b/internal/workloads/workloads_suite_test.go similarity index 100% rename from internal/dash0/workloads/workloads_suite_test.go rename to internal/workloads/workloads_suite_test.go diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index e70211c1..1351da13 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/startup" + "github.com/dash0hq/dash0-operator/internal/startup" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/events.go b/test/e2e/events.go index afa97ff0..41f9ba8a 100644 --- a/test/e2e/events.go +++ b/test/e2e/events.go @@ -10,7 +10,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" . "github.com/onsi/gomega" diff --git a/test/e2e/labels.go b/test/e2e/labels.go index a53a8462..bdb9c77c 100644 --- a/test/e2e/labels.go +++ b/test/e2e/labels.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/operator.go b/test/e2e/operator.go index 8a6a10a7..716a3929 100644 --- a/test/e2e/operator.go +++ b/test/e2e/operator.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/dash0hq/dash0-operator/internal/dash0/startup" + "github.com/dash0hq/dash0-operator/internal/startup" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/util/constants.go b/test/util/constants.go index be818e19..1e55996f 100644 --- a/test/util/constants.go +++ b/test/util/constants.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" dash0v1alpha1 "github.com/dash0hq/dash0-operator/api/dash0monitoring/v1alpha1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) const ( diff --git a/test/util/controller_deployment.go b/test/util/controller_deployment.go index b57ea110..be65ebd2 100644 --- a/test/util/controller_deployment.go +++ b/test/util/controller_deployment.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) func CreateControllerDeploymentWithoutSelfMonitoringWithoutAuth() *appsv1.Deployment { diff --git a/test/util/matchers.go b/test/util/matchers.go index cb8247d2..c5b739e0 100644 --- a/test/util/matchers.go +++ b/test/util/matchers.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" "github.com/onsi/gomega" "github.com/onsi/gomega/format" diff --git a/test/util/verification.go b/test/util/verification.go index 4720bb28..081ac1be 100644 --- a/test/util/verification.go +++ b/test/util/verification.go @@ -16,7 +16,7 @@ import ( . "github.com/onsi/gomega" - "github.com/dash0hq/dash0-operator/internal/dash0/util" + "github.com/dash0hq/dash0-operator/internal/util" ) type ContainerExpectations struct {