Skip to content

Commit 85fdcdf

Browse files
committed
feat: move config parsing from apis to internal/otelconfig
Signed-off-by: Ilia Petrov <ilia.yavorov.petrov@gmail.com>
1 parent f85f94f commit 85fdcdf

26 files changed

Lines changed: 2018 additions & 1971 deletions

apis/v1alpha1/convert.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"sigs.k8s.io/controller-runtime/pkg/conversion"
1414

1515
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
16+
"github.com/open-telemetry/opentelemetry-operator/internal/otelconfig"
1617
)
1718

1819
var _ conversion.Convertible = &OpenTelemetryCollector{}
@@ -301,7 +302,7 @@ func tov1alpha1Ports(in []v1beta1.PortsSpec) []PortsSpec {
301302

302303
func tov1alpha1(in v1beta1.OpenTelemetryCollector) (*OpenTelemetryCollector, error) {
303304
c := in.DeepCopy()
304-
configYaml, err := c.Spec.Config.Yaml()
305+
configYaml, err := otelconfig.Yaml(&c.Spec.Config)
305306
if err != nil {
306307
return nil, err
307308
}

0 commit comments

Comments
 (0)