Skip to content

Commit 745ba08

Browse files
authored
Fix monitoring test case (#3185)
1 parent f66f3f6 commit 745ba08

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Diff for: tests/e2e-openshift/monitoring/01-assert.yaml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
annotations:
5-
prometheus.io/path: /metrics
6-
prometheus.io/port: "8888"
7-
prometheus.io/scrape: "true"
84
labels:
95
app.kubernetes.io/component: opentelemetry-collector
106
app.kubernetes.io/managed-by: opentelemetry-operator
@@ -20,15 +16,19 @@ apiVersion: monitoring.coreos.com/v1
2016
kind: ServiceMonitor
2117
metadata:
2218
labels:
19+
app.kubernetes.io/component: opentelemetry-collector
2320
app.kubernetes.io/managed-by: opentelemetry-operator
2421
app.kubernetes.io/name: cluster-collector-monitoring-collector
22+
app.kubernetes.io/part-of: opentelemetry
2523
name: cluster-collector-monitoring-collector
2624
spec:
2725
endpoints:
2826
- port: monitoring
2927
selector:
3028
matchLabels:
29+
app.kubernetes.io/component: opentelemetry-collector
3130
app.kubernetes.io/managed-by: opentelemetry-operator
31+
app.kubernetes.io/part-of: opentelemetry
3232
operator.opentelemetry.io/collector-service-type: monitoring
3333
---
3434
apiVersion: v1
@@ -39,6 +39,7 @@ metadata:
3939
app.kubernetes.io/managed-by: opentelemetry-operator
4040
app.kubernetes.io/name: cluster-collector-collector
4141
app.kubernetes.io/part-of: opentelemetry
42+
operator.opentelemetry.io/collector-service-type: base
4243
name: cluster-collector-collector
4344
spec:
4445
ports:
@@ -57,7 +58,6 @@ spec:
5758
app.kubernetes.io/managed-by: opentelemetry-operator
5859
app.kubernetes.io/part-of: opentelemetry
5960
type: ClusterIP
60-
6161
---
6262
apiVersion: v1
6363
kind: Service
@@ -67,8 +67,8 @@ metadata:
6767
app.kubernetes.io/managed-by: opentelemetry-operator
6868
app.kubernetes.io/name: cluster-collector-collector
6969
app.kubernetes.io/part-of: opentelemetry
70-
operator.opentelemetry.io/collector-service-type: headless
7170
operator.opentelemetry.io/collector-headless-service: Exists
71+
operator.opentelemetry.io/collector-service-type: headless
7272
name: cluster-collector-collector-headless
7373
spec:
7474
ports:
@@ -96,6 +96,8 @@ metadata:
9696
app.kubernetes.io/managed-by: opentelemetry-operator
9797
app.kubernetes.io/name: cluster-collector-collector-monitoring
9898
app.kubernetes.io/part-of: opentelemetry
99+
operator.opentelemetry.io/collector-monitoring-service: Exists
100+
operator.opentelemetry.io/collector-service-type: monitoring
99101
name: cluster-collector-collector-monitoring
100102
spec:
101103
ports:

0 commit comments

Comments
 (0)