internal/manifests/collector: use v1alpha2.Config yaml method

Signed-off-by: Benedikt Bongartz <[email protected]>

Author: frzifus

internal/manifests/collector/config_replace.go

@@ -43,7 +43,7 @@ type Config struct {
 }
 
 func ReplaceConfig(instance v1alpha2.OpenTelemetryCollector) (string, error) {
-	cfgStr, err := yaml.Marshal(&instance.Spec.Config)
+	cfgStr, err := instance.Spec.Config.Yaml()
 	if err != nil {
 		return "", err
 	}
@@ -52,12 +52,12 @@ func ReplaceConfig(instance v1alpha2.OpenTelemetryCollector) (string, error) {
 		return string(cfgStr), nil
 	}
 
-	config, err := adapters.ConfigFromString(string(cfgStr))
+	config, err := adapters.ConfigFromString(cfgStr)
 	if err != nil {
 		return "", err
 	}
 
-	promCfgMap, getCfgPromErr := ta.ConfigToPromConfig(string(cfgStr))
+	promCfgMap, getCfgPromErr := ta.ConfigToPromConfig(cfgStr)
 	if getCfgPromErr != nil {
 		return "", getCfgPromErr
 	}

internal/manifests/collector/ingress.go

@@ -18,7 +18,6 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -143,11 +142,11 @@ func createSubdomainIngressRules(otelcol string, hostname string, ports []corev1
 }
 
 func servicePortsFromCfg(logger logr.Logger, otelcol v1alpha2.OpenTelemetryCollector) ([]corev1.ServicePort, error) {
-	out, err := yaml.Marshal(&otelcol.Spec.Config)
+	out, err := otelcol.Spec.Config.Yaml()
 	if err != nil {
 		return nil, err
 	}
-	configFromString, err := adapters.ConfigFromString(string(out))
+	configFromString, err := adapters.ConfigFromString(out)
 	if err != nil {
 		logger.Error(err, "couldn't extract the configuration from the context")
 		return nil, err

internal/manifests/collector/rbac.go

@@ -17,7 +17,6 @@ package collector
 import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/yaml"
 
 	"github.com/open-telemetry/opentelemetry-operator/internal/api/convert"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
@@ -32,12 +31,12 @@ func ClusterRole(params manifests.Params) (*rbacv1.ClusterRole, error) {
 		return nil, err
 	}
 
-	confStr, err := yaml.Marshal(&otelCol.Spec.Config)
+	confStr, err := otelCol.Spec.Config.Yaml()
 	if err != nil {
 		return nil, err
 	}
 
-	configFromString, err := adapters.ConfigFromString(string(confStr))
+	configFromString, err := adapters.ConfigFromString(confStr)
 	if err != nil {
 		params.Log.Error(err, "couldn't extract the configuration from the context")
 		return nil, nil
@@ -66,11 +65,11 @@ func ClusterRoleBinding(params manifests.Params) (*rbacv1.ClusterRoleBinding, er
 	if err != nil {
 		return nil, err
 	}
-	confStr, err := yaml.Marshal(&otelCol.Spec.Config)
+	confStr, err := otelCol.Spec.Config.Yaml()
 	if err != nil {
 		return nil, err
 	}
-	configFromString, err := adapters.ConfigFromString(string(confStr))
+	configFromString, err := adapters.ConfigFromString(confStr)
 	if err != nil {
 		params.Log.Error(err, "couldn't extract the configuration from the context")
 		return nil, nil

internal/manifests/collector/service.go

@@ -19,7 +19,6 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -73,12 +72,12 @@ func MonitoringService(params manifests.Params) (*corev1.Service, error) {
 	name := naming.MonitoringService(otelCol.Name)
 	labels := manifestutils.Labels(otelCol.ObjectMeta, name, otelCol.Spec.Image, ComponentOpenTelemetryCollector, []string{})
 
-	out, err := yaml.Marshal(&otelCol.Spec.Config)
+	out, err := otelCol.Spec.Config.Yaml()
 	if err != nil {
 		return nil, err
 	}
 
-	c, err := adapters.ConfigFromString(string(out))
+	c, err := adapters.ConfigFromString(out)
 	if err != nil {
 		params.Log.Error(err, "couldn't extract the configuration")
 		return nil, err
@@ -115,12 +114,12 @@ func Service(params manifests.Params) (*corev1.Service, error) {
 	name := naming.Service(otelCol.Name)
 	labels := manifestutils.Labels(otelCol.ObjectMeta, name, otelCol.Spec.Image, ComponentOpenTelemetryCollector, []string{})
 
-	out, err := yaml.Marshal(&otelCol.Spec.Config)
+	out, err := otelCol.Spec.Config.Yaml()
 	if err != nil {
 		return nil, err
 	}
 
-	configFromString, err := adapters.ConfigFromString(string(out))
+	configFromString, err := adapters.ConfigFromString(out)
 	if err != nil {
 		params.Log.Error(err, "couldn't extract the configuration from the context")
 		return nil, err