Fix

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

apis/v1alpha1/convert.go

@@ -156,14 +156,10 @@ func tov1beta1TA(in OpenTelemetryTargetAllocator) v1beta1.TargetAllocatorEmbedde
 		Enabled:            in.Enabled,
 		Affinity:           in.Affinity,
 		PrometheusCR: v1beta1.TargetAllocatorPrometheusCR{
-			Enabled:        in.PrometheusCR.Enabled,
-			ScrapeInterval: in.PrometheusCR.ScrapeInterval,
-			PodMonitorSelector: &metav1.LabelSelector{
-				MatchLabels: in.PrometheusCR.PodMonitorSelector,
-			},
-			ServiceMonitorSelector: &metav1.LabelSelector{
-				MatchLabels: in.PrometheusCR.ServiceMonitorSelector,
-			},
+			Enabled:                in.PrometheusCR.Enabled,
+			ScrapeInterval:         in.PrometheusCR.ScrapeInterval,
+			PodMonitorSelector:     toLabelSelector(in.PrometheusCR.PodMonitorSelector),
+			ServiceMonitorSelector: toLabelSelector(in.PrometheusCR.ServiceMonitorSelector),
 		},
 		SecurityContext:           in.SecurityContext,
 		PodSecurityContext:        in.PodSecurityContext,
@@ -180,6 +176,15 @@ func tov1beta1TA(in OpenTelemetryTargetAllocator) v1beta1.TargetAllocatorEmbedde
 	}
 }
 
+func toLabelSelector(selector map[string]string) *metav1.LabelSelector {
+	if selector == nil {
+		return nil
+	}
+	return &metav1.LabelSelector{
+		MatchLabels: selector,
+	}
+}
+
 func tov1beta1Autoscaler(in *AutoscalerSpec, minReplicas, maxReplicas *int32) *v1beta1.AutoscalerSpec {
 	if in == nil {
 		return nil

apis/v1alpha1/convert_test.go

@@ -421,3 +421,65 @@ func createTA() OpenTelemetryTargetAllocator {
 		},
 	}
 }
+
+func TestConvertTo(t *testing.T) {
+	col := OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "otel",
+		},
+		Spec: OpenTelemetryCollectorSpec{
+			ServiceAccount: "otelcol",
+		},
+		Status: OpenTelemetryCollectorStatus{
+			Image: "otel/col",
+		},
+	}
+	colbeta1 := v1beta1.OpenTelemetryCollector{}
+	err := col.ConvertTo(&colbeta1)
+	require.NoError(t, err)
+	assert.Equal(t, v1beta1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "otel",
+		},
+		Spec: v1beta1.OpenTelemetryCollectorSpec{
+			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
+				ServiceAccount: "otelcol",
+			},
+		},
+		Status: v1beta1.OpenTelemetryCollectorStatus{
+			Image: "otel/col",
+		},
+	}, colbeta1)
+}
+
+func TestConvertFrom(t *testing.T) {
+	colbeta1 := v1beta1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "otel",
+		},
+		Spec: v1beta1.OpenTelemetryCollectorSpec{
+			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
+				ServiceAccount: "otelcol",
+			},
+		},
+		Status: v1beta1.OpenTelemetryCollectorStatus{
+			Image: "otel/col",
+		},
+	}
+	col := OpenTelemetryCollector{}
+	err := col.ConvertFrom(&colbeta1)
+	require.NoError(t, err)
+	// set config to empty. The v1beta1 marshals config with empty receivers, exporters..
+	col.Spec.Config = ""
+	assert.Equal(t, OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "otel",
+		},
+		Spec: OpenTelemetryCollectorSpec{
+			ServiceAccount: "otelcol",
+		},
+		Status: OpenTelemetryCollectorStatus{
+			Image: "otel/col",
+		},
+	}, col)
+}

controllers/opentelemetrycollector_controller.go

@@ -18,7 +18,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 
 	"github.com/go-logr/logr"
 	routev1 "github.com/openshift/api/route/v1"
@@ -38,6 +37,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests"

pkg/sidecar/podmutator.go

@@ -17,7 +17,6 @@ package sidecar
 import (
 	"context"
 	"errors"
-	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"strings"
 
 	"github.com/go-logr/logr"
@@ -28,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"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/internal/webhook/podmutation"
 )