Skip to content

Commit 50a375d

Browse files
yuriolisayuriolisa
committed
Changed labels
Signed-off-by: Yuri Sa <[email protected]>
1 parent fd39eb9 commit 50a375d

File tree

2 files changed

+37
-42
lines changed

2 files changed

+37
-42
lines changed

‎controllers/builder_test.go

+36-35
Original file line numberDiff line numberDiff line change
@@ -317,12 +317,13 @@ service:
317317
Name: "test-collector-monitoring",
318318
Namespace: "test",
319319
Labels: map[string]string{
320-
"app.kubernetes.io/component": "opentelemetry-collector",
321-
"app.kubernetes.io/instance": "test.test",
322-
"app.kubernetes.io/managed-by": "opentelemetry-operator",
323-
"app.kubernetes.io/name": "test-collector-monitoring",
324-
"app.kubernetes.io/part-of": "opentelemetry",
325-
"app.kubernetes.io/version": "latest",
320+
"app.kubernetes.io/component": "opentelemetry-collector",
321+
"app.kubernetes.io/instance": "test.test",
322+
"app.kubernetes.io/managed-by": "opentelemetry-operator",
323+
"app.kubernetes.io/name": "test-collector-monitoring",
324+
"app.kubernetes.io/part-of": "opentelemetry",
325+
"app.kubernetes.io/version": "latest",
326+
"operator.opentelemetry.io/collector-monitoring-service": "Exists",
326327
},
327328
Annotations: nil,
328329
},
@@ -563,12 +564,13 @@ service:
563564
Name: "test-collector-monitoring",
564565
Namespace: "test",
565566
Labels: map[string]string{
566-
"app.kubernetes.io/component": "opentelemetry-collector",
567-
"app.kubernetes.io/instance": "test.test",
568-
"app.kubernetes.io/managed-by": "opentelemetry-operator",
569-
"app.kubernetes.io/name": "test-collector-monitoring",
570-
"app.kubernetes.io/part-of": "opentelemetry",
571-
"app.kubernetes.io/version": "latest",
567+
"app.kubernetes.io/component": "opentelemetry-collector",
568+
"app.kubernetes.io/instance": "test.test",
569+
"app.kubernetes.io/managed-by": "opentelemetry-operator",
570+
"app.kubernetes.io/name": "test-collector-monitoring",
571+
"app.kubernetes.io/part-of": "opentelemetry",
572+
"app.kubernetes.io/version": "latest",
573+
"operator.opentelemetry.io/collector-monitoring-service": "Exists",
572574
},
573575
Annotations: nil,
574576
},
@@ -830,12 +832,13 @@ service:
830832
Name: "test-collector-monitoring",
831833
Namespace: "test",
832834
Labels: map[string]string{
833-
"app.kubernetes.io/component": "opentelemetry-collector",
834-
"app.kubernetes.io/instance": "test.test",
835-
"app.kubernetes.io/managed-by": "opentelemetry-operator",
836-
"app.kubernetes.io/name": "test-collector-monitoring",
837-
"app.kubernetes.io/part-of": "opentelemetry",
838-
"app.kubernetes.io/version": "latest",
835+
"app.kubernetes.io/component": "opentelemetry-collector",
836+
"app.kubernetes.io/instance": "test.test",
837+
"app.kubernetes.io/managed-by": "opentelemetry-operator",
838+
"app.kubernetes.io/name": "test-collector-monitoring",
839+
"app.kubernetes.io/part-of": "opentelemetry",
840+
"app.kubernetes.io/version": "latest",
841+
"operator.opentelemetry.io/collector-monitoring-service": "Exists",
839842
},
840843
Annotations: nil,
841844
},
@@ -1309,12 +1312,13 @@ service:
13091312
Name: "test-collector-monitoring",
13101313
Namespace: "test",
13111314
Labels: map[string]string{
1312-
"app.kubernetes.io/component": "opentelemetry-collector",
1313-
"app.kubernetes.io/instance": "test.test",
1314-
"app.kubernetes.io/managed-by": "opentelemetry-operator",
1315-
"app.kubernetes.io/name": "test-collector-monitoring",
1316-
"app.kubernetes.io/part-of": "opentelemetry",
1317-
"app.kubernetes.io/version": "latest",
1315+
"app.kubernetes.io/component": "opentelemetry-collector",
1316+
"app.kubernetes.io/instance": "test.test",
1317+
"app.kubernetes.io/managed-by": "opentelemetry-operator",
1318+
"app.kubernetes.io/name": "test-collector-monitoring",
1319+
"app.kubernetes.io/part-of": "opentelemetry",
1320+
"app.kubernetes.io/version": "latest",
1321+
"operator.opentelemetry.io/collector-monitoring-service": "Exists",
13181322
},
13191323
Annotations: nil,
13201324
},
@@ -1706,12 +1710,13 @@ prometheus_cr:
17061710
Name: "test-collector-monitoring",
17071711
Namespace: "test",
17081712
Labels: map[string]string{
1709-
"app.kubernetes.io/component": "opentelemetry-collector",
1710-
"app.kubernetes.io/instance": "test.test",
1711-
"app.kubernetes.io/managed-by": "opentelemetry-operator",
1712-
"app.kubernetes.io/name": "test-collector-monitoring",
1713-
"app.kubernetes.io/part-of": "opentelemetry",
1714-
"app.kubernetes.io/version": "latest",
1713+
"app.kubernetes.io/component": "opentelemetry-collector",
1714+
"app.kubernetes.io/instance": "test.test",
1715+
"app.kubernetes.io/managed-by": "opentelemetry-operator",
1716+
"app.kubernetes.io/name": "test-collector-monitoring",
1717+
"app.kubernetes.io/part-of": "opentelemetry",
1718+
"app.kubernetes.io/version": "latest",
1719+
"operator.opentelemetry.io/collector-monitoring-service": "Exists",
17151720
},
17161721
Annotations: nil,
17171722
},
@@ -1944,11 +1949,7 @@ prometheus_cr:
19441949
},
19451950
Selector: v1.LabelSelector{
19461951
MatchLabels: map[string]string{
1947-
"app.kubernetes.io/component": "opentelemetry-targetallocator",
1948-
"app.kubernetes.io/instance": "test.test",
1949-
"app.kubernetes.io/managed-by": "opentelemetry-operator",
1950-
"app.kubernetes.io/name": "test-targetallocator",
1951-
"app.kubernetes.io/part-of": "opentelemetry",
1952+
"operator.opentelemetry.io/collector-monitoring-service": "Exists",
19521953
},
19531954
},
19541955
NamespaceSelector: monitoringv1.NamespaceSelector{

‎internal/manifests/collector/servicemonitor_test.go

+1-7
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ import (
1818
"fmt"
1919
"testing"
2020

21-
"github.com/open-telemetry/opentelemetry-operator/internal/naming"
22-
2321
"github.com/stretchr/testify/assert"
2422
)
2523

@@ -38,11 +36,7 @@ func TestDesiredServiceMonitors(t *testing.T) {
3836
assert.Equal(t, params.OtelCol.Namespace, actual.Namespace)
3937
assert.Equal(t, "monitoring", actual.Spec.Endpoints[0].Port)
4038
expectedSelectorLabels := map[string]string{
41-
"app.kubernetes.io/component": "opentelemetry-collector",
42-
"app.kubernetes.io/instance": fmt.Sprintf("%s.%s", params.OtelCol.Namespace, params.OtelCol.Name),
43-
"app.kubernetes.io/managed-by": "opentelemetry-operator",
44-
"app.kubernetes.io/part-of": "opentelemetry",
45-
"app.kubernetes.io/name": naming.MonitoringService(params.OtelCol.Name),
39+
"operator.opentelemetry.io/collector-monitoring-service": "Exists",
4640
}
4741
assert.Equal(t, expectedSelectorLabels, actual.Spec.Selector.MatchLabels)
4842
}

0 commit comments

Comments
 (0)