Fix

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

Author: pavolloffay

apis/v1alpha1/convert.go

@@ -32,7 +32,7 @@ func (src *OpenTelemetryCollector) ConvertTo(dstRaw conversion.Hub) error {
 	switch t := dstRaw.(type) {
 	case *v1beta1.OpenTelemetryCollector:
 		dst := dstRaw.(*v1beta1.OpenTelemetryCollector)
-		convertedSrc, err := Tov1beta1(*src)
+		convertedSrc, err := tov1beta1(*src)
 		if err != nil {
 			return fmt.Errorf("failed to convert to v1beta1: %w", err)
 		}
@@ -62,7 +62,7 @@ func (dst *OpenTelemetryCollector) ConvertFrom(srcRaw conversion.Hub) error {
 	return nil
 }
 
-func Tov1beta1(in OpenTelemetryCollector) (v1beta1.OpenTelemetryCollector, error) {
+func tov1beta1(in OpenTelemetryCollector) (v1beta1.OpenTelemetryCollector, error) {
 	copy := in.DeepCopy()
 	cfg := &v1beta1.Config{}
 	if err := yaml.Unmarshal([]byte(copy.Spec.Config), cfg); err != nil {

apis/v1alpha1/convert_test.go

@@ -62,7 +62,7 @@ func Test_tov1beta1_config(t *testing.T) {
 			},
 		}
 
-		cfgV2, err := Tov1beta1(cfgV1)
+		cfgV2, err := tov1beta1(cfgV1)
 		assert.Nil(t, err)
 		assert.NotNil(t, cfgV2)
 		assert.Equal(t, cfgV1.Spec.Args, cfgV2.Spec.Args)
@@ -79,7 +79,7 @@ func Test_tov1beta1_config(t *testing.T) {
 			},
 		}
 
-		_, err := Tov1beta1(cfgV1)
+		_, err := tov1beta1(cfgV1)
 		assert.ErrorContains(t, err, "could not convert config json to v1beta1.Config")
 	})
 }
@@ -310,7 +310,7 @@ func Test_tov1beta1AndBack(t *testing.T) {
 		},
 	}
 
-	colbeta1, err := Tov1beta1(*colalpha1)
+	colbeta1, err := tov1beta1(*colalpha1)
 	require.NoError(t, err)
 	colalpha1Converted, err := tov1alpha1(colbeta1)
 	require.NoError(t, err)

controllers/opentelemetrycollector_controller.go

@@ -18,6 +18,7 @@ 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"
@@ -130,7 +131,8 @@ func (r *OpenTelemetryCollectorReconciler) findOtelOwnedObjects(ctx context.Cont
 }
 
 func (r *OpenTelemetryCollectorReconciler) getParams(instance v1alpha1.OpenTelemetryCollector) (manifests.Params, error) {
-	otelCol, err := v1alpha1.Tov1beta1(instance)
+	otelCol := v1beta1.OpenTelemetryCollector{}
+	err := instance.ConvertTo(&otelCol)
 	if err != nil {
 		return manifests.Params{}, err
 	}

pkg/sidecar/pod_test.go

@@ -47,33 +47,35 @@ func TestAddSidecarWhenNoSidecarExists(t *testing.T) {
 			Volumes: []corev1.Volume{{}},
 		},
 	}
-	otelcol, err := v1alpha1.Tov1beta1(
-		v1alpha1.OpenTelemetryCollector{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      "otelcol-sample-with-a-name-that-is-longer-than-sixty-three-characters",
-				Namespace: "some-app",
-			},
-			Spec: v1alpha1.OpenTelemetryCollectorSpec{
-				Ports: []corev1.ServicePort{
-					{
-						Name:     "metrics",
-						Port:     8888,
-						Protocol: corev1.ProtocolTCP,
-					},
+
+	v1alpha1Col := v1alpha1.OpenTelemetryCollector{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "otelcol-sample-with-a-name-that-is-longer-than-sixty-three-characters",
+			Namespace: "some-app",
+		},
+		Spec: v1alpha1.OpenTelemetryCollectorSpec{
+			Ports: []corev1.ServicePort{
+				{
+					Name:     "metrics",
+					Port:     8888,
+					Protocol: corev1.ProtocolTCP,
 				},
-				InitContainers: []corev1.Container{
-					{
-						Name: "test",
-					},
+			},
+			InitContainers: []corev1.Container{
+				{
+					Name: "test",
 				},
-				Config: `
+			},
+			Config: `
 receivers:
 exporters:
 processors:
 `,
-			},
 		},
-	)
+	}
+
+	otelcol := v1beta1.OpenTelemetryCollector{}
+	err := v1alpha1Col.ConvertTo(&otelcol)
 	require.NoError(t, err)
 	otelcolYaml, err := otelcol.Spec.Config.Yaml()
 	require.NoError(t, err)

pkg/sidecar/podmutator.go

@@ -17,6 +17,7 @@ package sidecar
 import (
 	"context"
 	"errors"
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"strings"
 
 	"github.com/go-logr/logr"
@@ -97,7 +98,8 @@ func (p *sidecarPodMutator) Mutate(ctx context.Context, ns corev1.Namespace, pod
 	// we should add the sidecar.
 	logger.V(1).Info("injecting sidecar into pod", "otelcol-namespace", otelcol.Namespace, "otelcol-name", otelcol.Name)
 
-	otc, err := v1alpha1.Tov1beta1(otelcol)
+	otc := v1beta1.OpenTelemetryCollector{}
+	err = otelcol.ConvertTo(&otc)
 	if err != nil {
 		return corev1.Pod{}, err
 	}