Move label definition to constants package

Author: swiatekm

controllers/opentelemetrycollector_controller.go

@@ -48,11 +48,10 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
 	collectorStatus "github.com/open-telemetry/opentelemetry-operator/internal/status/collector"
+	"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
-const collectorTargetAllocatorLabelName = "opentelemetry.io/target-allocator"
-
 var (
 	ownedClusterObjectTypes = []client.Object{
 		&rbacv1.ClusterRole{},
@@ -191,10 +190,9 @@ func (r *OpenTelemetryCollectorReconciler) GetParams(ctx context.Context, instan
 }
 
 func (r *OpenTelemetryCollectorReconciler) getTargetAllocator(ctx context.Context, params manifests.Params) (*v1alpha1.TargetAllocator, error) {
-	otelcol := params.OtelCol
-	if taName, ok := otelcol.GetLabels()[collectorTargetAllocatorLabelName]; ok {
+	if taName, ok := params.OtelCol.GetLabels()[constants.LabelTargetAllocator]; ok {
 		targetAllocator := &v1alpha1.TargetAllocator{}
-		taKey := client.ObjectKey{Name: taName, Namespace: otelcol.GetNamespace()}
+		taKey := client.ObjectKey{Name: taName, Namespace: params.OtelCol.GetNamespace()}
 		err := r.Client.Get(ctx, taKey, targetAllocator)
 		if err != nil {
 			return nil, err

controllers/suite_test.go

@@ -64,7 +64,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector/testdata"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
 	"github.com/open-telemetry/opentelemetry-operator/internal/rbac"
-	// +kubebuilder:scaffold:imports
 )
 
 var (

controllers/targetallocator_controller.go

@@ -42,6 +42,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
 	taStatus "github.com/open-telemetry/opentelemetry-operator/internal/status/targetallocator"
+	"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
@@ -102,7 +103,7 @@ func (r *TargetAllocatorReconciler) getCollector(ctx context.Context, instance v
 	listOpts := []client.ListOption{
 		client.InNamespace(instance.GetNamespace()),
 		client.MatchingLabels{
-			collectorTargetAllocatorLabelName: instance.GetName(),
+			constants.LabelTargetAllocator: instance.GetName(),
 		},
 	}
 	err := r.List(ctx, &collectors, listOpts...)
@@ -216,7 +217,7 @@ func (r *TargetAllocatorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	collectorSelector := metav1.LabelSelector{
 		MatchExpressions: []metav1.LabelSelectorRequirement{
 			{
-				Key:      collectorTargetAllocatorLabelName,
+				Key:      constants.LabelTargetAllocator,
 				Operator: metav1.LabelSelectorOpExists,
 			},
 		},
@@ -246,7 +247,7 @@ func getTargetAllocatorForCollector(_ context.Context, collector client.Object)
 }
 
 func getTargetAllocatorRequestsFromLabel(_ context.Context, collector client.Object) []reconcile.Request {
-	if taName, ok := collector.GetLabels()[collectorTargetAllocatorLabelName]; ok {
+	if taName, ok := collector.GetLabels()[constants.LabelTargetAllocator]; ok {
 		return []reconcile.Request{
 			{
 				NamespacedName: types.NamespacedName{

controllers/targetallocator_reconciler_test.go

@@ -36,6 +36,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
+	"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
 )
 
 var testLogger = logf.Log.WithName("opamp-bridge-controller-unit-tests")
@@ -57,7 +58,7 @@ func TestTargetAllocatorReconciler_GetCollector(t *testing.T) {
 		ObjectMeta: metav1.ObjectMeta{
 			Name: "test",
 			Labels: map[string]string{
-				collectorTargetAllocatorLabelName: "label-ta",
+				constants.LabelTargetAllocator: "label-ta",
 			},
 		},
 	}
@@ -163,7 +164,7 @@ func TestGetTargetAllocatorRequestsFromLabel(t *testing.T) {
 			Name:      "test",
 			Namespace: "default",
 			Labels: map[string]string{
-				collectorTargetAllocatorLabelName: "label-ta",
+				constants.LabelTargetAllocator: "label-ta",
 			},
 		},
 	}

pkg/constants/env.go

@@ -40,6 +40,7 @@ const (
 	LabelAppVersion  = "app.kubernetes.io/version"
 	LabelAppPartOf   = "app.kubernetes.io/part-of"
 
+	LabelTargetAllocator              = "opentelemetry.io/target-allocator"
 	ResourceAttributeAnnotationPrefix = "resource.opentelemetry.io/"
 
 	EnvPodName  = "OTEL_RESOURCE_ATTRIBUTES_POD_NAME"