From bca72931a6348ac2e42df3ee1ec5dc2eb73b4f6e Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Tue, 19 Oct 2021 12:43:35 +0200 Subject: [PATCH] Move otelcol api into api/otelcol Signed-off-by: Pavol Loffay --- api/{ => otelcol}/v1alpha1/groupversion_info.go | 0 api/{ => otelcol}/v1alpha1/mode.go | 0 api/{ => otelcol}/v1alpha1/opentelemetrycollector_types.go | 0 api/{ => otelcol}/v1alpha1/opentelemetrycollector_webhook.go | 0 api/{ => otelcol}/v1alpha1/zz_generated.deepcopy.go | 0 controllers/opentelemetrycollector_controller.go | 2 +- controllers/opentelemetrycollector_controller_test.go | 2 +- controllers/suite_test.go | 2 +- internal/podinjector/main.go | 2 +- internal/podinjector/main_test.go | 2 +- internal/podinjector/podinjector_suite_test.go | 2 +- main.go | 2 +- pkg/collector/annotations.go | 2 +- pkg/collector/annotations_test.go | 2 +- pkg/collector/container.go | 2 +- pkg/collector/container_test.go | 2 +- pkg/collector/daemonset.go | 2 +- pkg/collector/daemonset_test.go | 2 +- pkg/collector/deployment.go | 2 +- pkg/collector/deployment_test.go | 2 +- pkg/collector/labels.go | 2 +- pkg/collector/labels_test.go | 2 +- pkg/collector/reconcile/configmap_test.go | 2 +- pkg/collector/reconcile/deployment_test.go | 2 +- pkg/collector/reconcile/opentelemetry_test.go | 2 +- pkg/collector/reconcile/params.go | 2 +- pkg/collector/reconcile/service.go | 2 +- pkg/collector/reconcile/service_test.go | 2 +- pkg/collector/reconcile/serviceaccount.go | 2 +- pkg/collector/reconcile/suite_test.go | 2 +- pkg/collector/serviceaccount.go | 2 +- pkg/collector/serviceaccount_test.go | 2 +- pkg/collector/statefulset.go | 2 +- pkg/collector/statefulset_test.go | 2 +- pkg/collector/upgrade/noop.go | 2 +- pkg/collector/upgrade/suite_test.go | 2 +- pkg/collector/upgrade/upgrade.go | 2 +- pkg/collector/upgrade/upgrade_test.go | 2 +- pkg/collector/upgrade/v0_15_0.go | 2 +- pkg/collector/upgrade/v0_15_0_test.go | 2 +- pkg/collector/upgrade/v0_19_0.go | 2 +- pkg/collector/upgrade/v0_19_0_test.go | 2 +- pkg/collector/upgrade/v0_24_0.go | 2 +- pkg/collector/upgrade/v0_24_0_test.go | 2 +- pkg/collector/upgrade/v0_2_10.go | 2 +- pkg/collector/upgrade/v0_31_0.go | 2 +- pkg/collector/upgrade/v0_31_0_test.go | 2 +- pkg/collector/upgrade/v0_9_0.go | 2 +- pkg/collector/upgrade/v0_9_0_test.go | 2 +- pkg/collector/upgrade/versions.go | 2 +- pkg/collector/volume.go | 2 +- pkg/collector/volume_test.go | 2 +- pkg/collector/volumeclaim.go | 2 +- pkg/collector/volumeclaim_test.go | 2 +- pkg/naming/main.go | 2 +- pkg/sidecar/pod.go | 2 +- pkg/sidecar/pod_test.go | 2 +- pkg/targetallocator/container.go | 2 +- pkg/targetallocator/container_test.go | 2 +- pkg/targetallocator/deployment.go | 2 +- pkg/targetallocator/deployment_test.go | 2 +- pkg/targetallocator/labels.go | 2 +- pkg/targetallocator/labels_test.go | 2 +- pkg/targetallocator/volume.go | 2 +- pkg/targetallocator/volume_test.go | 2 +- 65 files changed, 60 insertions(+), 60 deletions(-) rename api/{ => otelcol}/v1alpha1/groupversion_info.go (100%) rename api/{ => otelcol}/v1alpha1/mode.go (100%) rename api/{ => otelcol}/v1alpha1/opentelemetrycollector_types.go (100%) rename api/{ => otelcol}/v1alpha1/opentelemetrycollector_webhook.go (100%) rename api/{ => otelcol}/v1alpha1/zz_generated.deepcopy.go (100%) diff --git a/api/v1alpha1/groupversion_info.go b/api/otelcol/v1alpha1/groupversion_info.go similarity index 100% rename from api/v1alpha1/groupversion_info.go rename to api/otelcol/v1alpha1/groupversion_info.go diff --git a/api/v1alpha1/mode.go b/api/otelcol/v1alpha1/mode.go similarity index 100% rename from api/v1alpha1/mode.go rename to api/otelcol/v1alpha1/mode.go diff --git a/api/v1alpha1/opentelemetrycollector_types.go b/api/otelcol/v1alpha1/opentelemetrycollector_types.go similarity index 100% rename from api/v1alpha1/opentelemetrycollector_types.go rename to api/otelcol/v1alpha1/opentelemetrycollector_types.go diff --git a/api/v1alpha1/opentelemetrycollector_webhook.go b/api/otelcol/v1alpha1/opentelemetrycollector_webhook.go similarity index 100% rename from api/v1alpha1/opentelemetrycollector_webhook.go rename to api/otelcol/v1alpha1/opentelemetrycollector_webhook.go diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/otelcol/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from api/v1alpha1/zz_generated.deepcopy.go rename to api/otelcol/v1alpha1/zz_generated.deepcopy.go diff --git a/controllers/opentelemetrycollector_controller.go b/controllers/opentelemetrycollector_controller.go index 27a54ff62a..63d294f0fe 100644 --- a/controllers/opentelemetrycollector_controller.go +++ b/controllers/opentelemetrycollector_controller.go @@ -28,7 +28,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/reconcile" ) diff --git a/controllers/opentelemetrycollector_controller_test.go b/controllers/opentelemetrycollector_controller_test.go index b4ad9b3f01..56fdd43e26 100644 --- a/controllers/opentelemetrycollector_controller_test.go +++ b/controllers/opentelemetrycollector_controller_test.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" k8sreconcile "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/controllers" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/reconcile" diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 7b3cfdceff..4530ad1ec2 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/internal/podinjector/main.go b/internal/podinjector/main.go index e9d99473c2..1c91f0d500 100644 --- a/internal/podinjector/main.go +++ b/internal/podinjector/main.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/sidecar" ) diff --git a/internal/podinjector/main_test.go b/internal/podinjector/main_test.go index bc1bd72f88..55050ea8aa 100644 --- a/internal/podinjector/main_test.go +++ b/internal/podinjector/main_test.go @@ -30,7 +30,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" . "github.com/open-telemetry/opentelemetry-operator/internal/podinjector" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" diff --git a/internal/podinjector/podinjector_suite_test.go b/internal/podinjector/podinjector_suite_test.go index 5ba5b73498..7a13da2179 100644 --- a/internal/podinjector/podinjector_suite_test.go +++ b/internal/podinjector/podinjector_suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/main.go b/main.go index f8feb9aa44..2a865d1322 100644 --- a/main.go +++ b/main.go @@ -33,7 +33,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/webhook" - opentelemetryiov1alpha1 "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + opentelemetryiov1alpha1 "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/controllers" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/internal/podinjector" diff --git a/pkg/collector/annotations.go b/pkg/collector/annotations.go index 1d7cc9b4bf..28c1e23c1b 100644 --- a/pkg/collector/annotations.go +++ b/pkg/collector/annotations.go @@ -18,7 +18,7 @@ import ( "crypto/sha256" "fmt" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) // Annotations return the annotations for OpenTelemetryCollector pod. diff --git a/pkg/collector/annotations_test.go b/pkg/collector/annotations_test.go index 2e5adf0ce8..33d9d320d5 100644 --- a/pkg/collector/annotations_test.go +++ b/pkg/collector/annotations_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) func TestDefaultAnnotations(t *testing.T) { diff --git a/pkg/collector/container.go b/pkg/collector/container.go index 17db543898..11c197862f 100644 --- a/pkg/collector/container.go +++ b/pkg/collector/container.go @@ -20,7 +20,7 @@ import ( "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/collector/container_test.go b/pkg/collector/container_test.go index 2ec9e8f61c..70065793e7 100644 --- a/pkg/collector/container_test.go +++ b/pkg/collector/container_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/daemonset.go b/pkg/collector/daemonset.go index 0a85b7ad00..8e5555bc68 100644 --- a/pkg/collector/daemonset.go +++ b/pkg/collector/daemonset.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/collector/daemonset_test.go b/pkg/collector/daemonset_test.go index ce236707a1..11c670cbc9 100644 --- a/pkg/collector/daemonset_test.go +++ b/pkg/collector/daemonset_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/deployment.go b/pkg/collector/deployment.go index f0508218a8..57f284703e 100644 --- a/pkg/collector/deployment.go +++ b/pkg/collector/deployment.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/collector/deployment_test.go b/pkg/collector/deployment_test.go index 6bc08e377f..0e19b68a9e 100644 --- a/pkg/collector/deployment_test.go +++ b/pkg/collector/deployment_test.go @@ -21,7 +21,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/labels.go b/pkg/collector/labels.go index 0d62e22704..b31d4da267 100644 --- a/pkg/collector/labels.go +++ b/pkg/collector/labels.go @@ -17,7 +17,7 @@ package collector import ( "fmt" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) // Labels return the common labels to all objects that are part of a managed OpenTelemetryCollector. diff --git a/pkg/collector/labels_test.go b/pkg/collector/labels_test.go index 3a6a1e0d41..37ab773e05 100644 --- a/pkg/collector/labels_test.go +++ b/pkg/collector/labels_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/reconcile/configmap_test.go b/pkg/collector/reconcile/configmap_test.go index 8ee8775b5c..d855760fce 100644 --- a/pkg/collector/reconcile/configmap_test.go +++ b/pkg/collector/reconcile/configmap_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/tools/record" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" ta "github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator/adapters" ) diff --git a/pkg/collector/reconcile/deployment_test.go b/pkg/collector/reconcile/deployment_test.go index 5069c2b154..e6c8188dec 100644 --- a/pkg/collector/reconcile/deployment_test.go +++ b/pkg/collector/reconcile/deployment_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/collector" "github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator" ) diff --git a/pkg/collector/reconcile/opentelemetry_test.go b/pkg/collector/reconcile/opentelemetry_test.go index 50c08d78e1..f4d7d81ad6 100644 --- a/pkg/collector/reconcile/opentelemetry_test.go +++ b/pkg/collector/reconcile/opentelemetry_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) func TestSelf(t *testing.T) { diff --git a/pkg/collector/reconcile/params.go b/pkg/collector/reconcile/params.go index 6fcbf8dc06..8ff833f1fa 100644 --- a/pkg/collector/reconcile/params.go +++ b/pkg/collector/reconcile/params.go @@ -20,7 +20,7 @@ import ( "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" ) diff --git a/pkg/collector/reconcile/service.go b/pkg/collector/reconcile/service.go index b1c9239441..98a39a44c8 100644 --- a/pkg/collector/reconcile/service.go +++ b/pkg/collector/reconcile/service.go @@ -27,7 +27,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/collector" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" diff --git a/pkg/collector/reconcile/service_test.go b/pkg/collector/reconcile/service_test.go index 461f5f69ab..223b265575 100644 --- a/pkg/collector/reconcile/service_test.go +++ b/pkg/collector/reconcile/service_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/reconcile/serviceaccount.go b/pkg/collector/reconcile/serviceaccount.go index ecf140b3dc..8bdd537741 100644 --- a/pkg/collector/reconcile/serviceaccount.go +++ b/pkg/collector/reconcile/serviceaccount.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/reconcile/suite_test.go b/pkg/collector/reconcile/suite_test.go index bc91d64c00..112759d23a 100644 --- a/pkg/collector/reconcile/suite_test.go +++ b/pkg/collector/reconcile/suite_test.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" ) diff --git a/pkg/collector/serviceaccount.go b/pkg/collector/serviceaccount.go index 17ba39a7c7..b1aeffb864 100644 --- a/pkg/collector/serviceaccount.go +++ b/pkg/collector/serviceaccount.go @@ -18,7 +18,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/collector/serviceaccount_test.go b/pkg/collector/serviceaccount_test.go index 1430811a4a..6cce1184cb 100644 --- a/pkg/collector/serviceaccount_test.go +++ b/pkg/collector/serviceaccount_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/statefulset.go b/pkg/collector/statefulset.go index 5751b0fcf1..c49509d288 100644 --- a/pkg/collector/statefulset.go +++ b/pkg/collector/statefulset.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/collector/statefulset_test.go b/pkg/collector/statefulset_test.go index 3723596969..b29834a60e 100644 --- a/pkg/collector/statefulset_test.go +++ b/pkg/collector/statefulset_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/collector/upgrade/noop.go b/pkg/collector/upgrade/noop.go index bf0598cf32..af294a8c7a 100644 --- a/pkg/collector/upgrade/noop.go +++ b/pkg/collector/upgrade/noop.go @@ -17,7 +17,7 @@ package upgrade import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) //nolint unused diff --git a/pkg/collector/upgrade/suite_test.go b/pkg/collector/upgrade/suite_test.go index 47ca3150c1..df1d123bf5 100644 --- a/pkg/collector/upgrade/suite_test.go +++ b/pkg/collector/upgrade/suite_test.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/pkg/collector/upgrade/upgrade.go b/pkg/collector/upgrade/upgrade.go index fd4495b162..514112b12f 100644 --- a/pkg/collector/upgrade/upgrade.go +++ b/pkg/collector/upgrade/upgrade.go @@ -24,7 +24,7 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/version" ) diff --git a/pkg/collector/upgrade/upgrade_test.go b/pkg/collector/upgrade/upgrade_test.go index 449246b678..f7ff3aea4c 100644 --- a/pkg/collector/upgrade/upgrade_test.go +++ b/pkg/collector/upgrade/upgrade_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/types" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/version" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade" ) diff --git a/pkg/collector/upgrade/v0_15_0.go b/pkg/collector/upgrade/v0_15_0.go index 4fbac3ea2b..66da57afdc 100644 --- a/pkg/collector/upgrade/v0_15_0.go +++ b/pkg/collector/upgrade/v0_15_0.go @@ -17,7 +17,7 @@ package upgrade import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) func upgrade0_15_0(cl client.Client, otelcol *v1alpha1.OpenTelemetryCollector) (*v1alpha1.OpenTelemetryCollector, error) { diff --git a/pkg/collector/upgrade/v0_15_0_test.go b/pkg/collector/upgrade/v0_15_0_test.go index dd4c4bea06..5ddfdefb2c 100644 --- a/pkg/collector/upgrade/v0_15_0_test.go +++ b/pkg/collector/upgrade/v0_15_0_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/version" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade" ) diff --git a/pkg/collector/upgrade/v0_19_0.go b/pkg/collector/upgrade/v0_19_0.go index ad69d09b51..a7193ba17a 100644 --- a/pkg/collector/upgrade/v0_19_0.go +++ b/pkg/collector/upgrade/v0_19_0.go @@ -21,7 +21,7 @@ import ( "gopkg.in/yaml.v2" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters" ) diff --git a/pkg/collector/upgrade/v0_19_0_test.go b/pkg/collector/upgrade/v0_19_0_test.go index 0bb2acda5f..ea3dd84098 100644 --- a/pkg/collector/upgrade/v0_19_0_test.go +++ b/pkg/collector/upgrade/v0_19_0_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/version" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade" diff --git a/pkg/collector/upgrade/v0_24_0.go b/pkg/collector/upgrade/v0_24_0.go index 3eddfaaee9..8c1dfe3f17 100644 --- a/pkg/collector/upgrade/v0_24_0.go +++ b/pkg/collector/upgrade/v0_24_0.go @@ -21,7 +21,7 @@ import ( "gopkg.in/yaml.v2" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters" ) diff --git a/pkg/collector/upgrade/v0_24_0_test.go b/pkg/collector/upgrade/v0_24_0_test.go index 861a6b3742..552e6191e2 100644 --- a/pkg/collector/upgrade/v0_24_0_test.go +++ b/pkg/collector/upgrade/v0_24_0_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/version" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade" ) diff --git a/pkg/collector/upgrade/v0_2_10.go b/pkg/collector/upgrade/v0_2_10.go index c4e7c5c6b6..c87cb0b4a3 100644 --- a/pkg/collector/upgrade/v0_2_10.go +++ b/pkg/collector/upgrade/v0_2_10.go @@ -17,7 +17,7 @@ package upgrade import ( "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) // this is our first version under otel/opentelemetry-collector. diff --git a/pkg/collector/upgrade/v0_31_0.go b/pkg/collector/upgrade/v0_31_0.go index 1fb3e5d443..8914e3a02f 100644 --- a/pkg/collector/upgrade/v0_31_0.go +++ b/pkg/collector/upgrade/v0_31_0.go @@ -21,7 +21,7 @@ import ( "gopkg.in/yaml.v2" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters" ) diff --git a/pkg/collector/upgrade/v0_31_0_test.go b/pkg/collector/upgrade/v0_31_0_test.go index eeaf6fd87d..e6efaa0318 100644 --- a/pkg/collector/upgrade/v0_31_0_test.go +++ b/pkg/collector/upgrade/v0_31_0_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/version" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade" ) diff --git a/pkg/collector/upgrade/v0_9_0.go b/pkg/collector/upgrade/v0_9_0.go index 5747282c14..6094ccc37a 100644 --- a/pkg/collector/upgrade/v0_9_0.go +++ b/pkg/collector/upgrade/v0_9_0.go @@ -21,7 +21,7 @@ import ( "gopkg.in/yaml.v2" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters" ) diff --git a/pkg/collector/upgrade/v0_9_0_test.go b/pkg/collector/upgrade/v0_9_0_test.go index 9d71715e8c..70d84797c1 100644 --- a/pkg/collector/upgrade/v0_9_0_test.go +++ b/pkg/collector/upgrade/v0_9_0_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/version" "github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade" ) diff --git a/pkg/collector/upgrade/versions.go b/pkg/collector/upgrade/versions.go index 63372d9997..f280081ee7 100644 --- a/pkg/collector/upgrade/versions.go +++ b/pkg/collector/upgrade/versions.go @@ -18,7 +18,7 @@ import ( "github.com/Masterminds/semver/v3" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) type upgradeFunc func(cl client.Client, otelcol *v1alpha1.OpenTelemetryCollector) (*v1alpha1.OpenTelemetryCollector, error) diff --git a/pkg/collector/volume.go b/pkg/collector/volume.go index 292326e7ce..77f8d6a42d 100644 --- a/pkg/collector/volume.go +++ b/pkg/collector/volume.go @@ -18,7 +18,7 @@ package collector import ( corev1 "k8s.io/api/core/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/collector/volume_test.go b/pkg/collector/volume_test.go index ecc3aa808a..d7f41e97ef 100644 --- a/pkg/collector/volume_test.go +++ b/pkg/collector/volume_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" diff --git a/pkg/collector/volumeclaim.go b/pkg/collector/volumeclaim.go index 421d71ce93..ef8a274d78 100644 --- a/pkg/collector/volumeclaim.go +++ b/pkg/collector/volumeclaim.go @@ -20,7 +20,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" ) diff --git a/pkg/collector/volumeclaim_test.go b/pkg/collector/volumeclaim_test.go index 7f17c285a3..85cc40b4da 100644 --- a/pkg/collector/volumeclaim_test.go +++ b/pkg/collector/volumeclaim_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" . "github.com/open-telemetry/opentelemetry-operator/pkg/collector" ) diff --git a/pkg/naming/main.go b/pkg/naming/main.go index 49970f4ec7..86b82d1cc4 100644 --- a/pkg/naming/main.go +++ b/pkg/naming/main.go @@ -18,7 +18,7 @@ package naming import ( "fmt" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) // ConfigMap builds the name for the config map used in the OpenTelemetryCollector containers. diff --git a/pkg/sidecar/pod.go b/pkg/sidecar/pod.go index 0dd4a79bf3..4b582b0cf1 100644 --- a/pkg/sidecar/pod.go +++ b/pkg/sidecar/pod.go @@ -21,7 +21,7 @@ import ( "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/collector" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" diff --git a/pkg/sidecar/pod_test.go b/pkg/sidecar/pod_test.go index d7c8795dc2..4a0e98b950 100644 --- a/pkg/sidecar/pod_test.go +++ b/pkg/sidecar/pod_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" "github.com/open-telemetry/opentelemetry-operator/pkg/sidecar" diff --git a/pkg/targetallocator/container.go b/pkg/targetallocator/container.go index 139f9126e6..50c16aa711 100644 --- a/pkg/targetallocator/container.go +++ b/pkg/targetallocator/container.go @@ -18,7 +18,7 @@ import ( "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/targetallocator/container_test.go b/pkg/targetallocator/container_test.go index 70314f3b69..ad113dcf7a 100644 --- a/pkg/targetallocator/container_test.go +++ b/pkg/targetallocator/container_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/targetallocator/deployment.go b/pkg/targetallocator/deployment.go index 1b79b9d3c8..1dd5d6f5c8 100644 --- a/pkg/targetallocator/deployment.go +++ b/pkg/targetallocator/deployment.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/targetallocator/deployment_test.go b/pkg/targetallocator/deployment_test.go index 11e2b05db1..c087687ac8 100644 --- a/pkg/targetallocator/deployment_test.go +++ b/pkg/targetallocator/deployment_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" ) diff --git a/pkg/targetallocator/labels.go b/pkg/targetallocator/labels.go index f825d633d9..a64bfea2b1 100644 --- a/pkg/targetallocator/labels.go +++ b/pkg/targetallocator/labels.go @@ -17,7 +17,7 @@ package targetallocator import ( "fmt" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) // Labels return the common labels to all TargetAllocator objects that are part of a managed OpenTelemetryCollector. diff --git a/pkg/targetallocator/labels_test.go b/pkg/targetallocator/labels_test.go index 83accd55fb..8475a592f4 100644 --- a/pkg/targetallocator/labels_test.go +++ b/pkg/targetallocator/labels_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" ) func TestLabelsCommonSet(t *testing.T) { diff --git a/pkg/targetallocator/volume.go b/pkg/targetallocator/volume.go index 33f901ff6e..22cfc65ef2 100644 --- a/pkg/targetallocator/volume.go +++ b/pkg/targetallocator/volume.go @@ -17,7 +17,7 @@ package targetallocator import ( corev1 "k8s.io/api/core/v1" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" ) diff --git a/pkg/targetallocator/volume_test.go b/pkg/targetallocator/volume_test.go index 11b0da1f2b..0e9b4462ea 100644 --- a/pkg/targetallocator/volume_test.go +++ b/pkg/targetallocator/volume_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/open-telemetry/opentelemetry-operator/api/v1alpha1" + "github.com/open-telemetry/opentelemetry-operator/api/otelcol/v1alpha1" "github.com/open-telemetry/opentelemetry-operator/internal/config" "github.com/open-telemetry/opentelemetry-operator/pkg/naming" )