Skip to content

Commit 74fa022

Browse files
committed
controllers/builder: adapt ident in unit test
Signed-off-by: Benedikt Bongartz <[email protected]>
1 parent 79748d6 commit 74fa022

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

controllers/builder_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ service:
232232
Annotations: nil,
233233
},
234234
Data: map[string]string{
235-
"collector.yaml": "receivers:\n examplereceiver:\n endpoint: \"0.0.0.0:12345\"\nexporters:\n logging:\nservice:\n pipelines:\n metrics:\n receivers: [examplereceiver]\n exporters: [logging]\n",
235+
"collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - examplereceiver\n",
236236
},
237237
},
238238
&corev1.ServiceAccount{
@@ -476,7 +476,7 @@ service:
476476
Annotations: nil,
477477
},
478478
Data: map[string]string{
479-
"collector.yaml": "receivers:\n examplereceiver:\n endpoint: \"0.0.0.0:12345\"\nexporters:\n logging:\nservice:\n pipelines:\n metrics:\n receivers: [examplereceiver]\n exporters: [logging]\n",
479+
"collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - examplereceiver\n",
480480
},
481481
},
482482
&corev1.ServiceAccount{
@@ -753,7 +753,7 @@ service:
753753
Annotations: nil,
754754
},
755755
Data: map[string]string{
756-
"collector.yaml": "receivers:\n examplereceiver:\n endpoint: \"0.0.0.0:12345\"\nexporters:\n logging:\nservice:\n pipelines:\n metrics:\n receivers: [examplereceiver]\n exporters: [logging]\n",
756+
"collector.yaml": "receivers:\n examplereceiver:\n endpoint: 0.0.0.0:12345\nexporters:\n logging: null\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - examplereceiver\n",
757757
},
758758
},
759759
&corev1.Service{
@@ -1265,7 +1265,7 @@ service:
12651265
Annotations: nil,
12661266
},
12671267
Data: map[string]string{
1268-
"collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n",
1268+
"collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n",
12691269
},
12701270
},
12711271
&corev1.ServiceAccount{
@@ -1657,7 +1657,7 @@ label_selector:
16571657
Annotations: nil,
16581658
},
16591659
Data: map[string]string{
1660-
"collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n",
1660+
"collector.yaml": "exporters:\n logging: null\nreceivers:\n prometheus:\n config: {}\n target_allocator:\n collector_id: ${POD_NAME}\n endpoint: http://test-targetallocator:80\n interval: 30s\nservice:\n pipelines:\n metrics:\n exporters:\n - logging\n receivers:\n - prometheus\n",
16611661
},
16621662
},
16631663
&corev1.ServiceAccount{

pkg/sidecar/pod_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919

2020
"github.com/stretchr/testify/assert"
2121
"github.com/stretchr/testify/require"
22-
"gopkg.in/yaml.v3"
2322
corev1 "k8s.io/api/core/v1"
2423
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2524
logf "sigs.k8s.io/controller-runtime/pkg/log"
@@ -77,7 +76,7 @@ processors:
7776
},
7877
)
7978
require.NoError(t, err)
80-
otelcolYaml, err := yaml.Marshal(otelcol.Spec.Config)
79+
otelcolYaml, err := otelcol.Spec.Config.Yaml()
8180
require.NoError(t, err)
8281
cfg := config.New(config.WithCollectorImage("some-default-image"))
8382

0 commit comments

Comments
 (0)