Skip to content

Commit 29fb926

Browse files
vyzigoldopenshift-cherrypick-robot
authored andcommitted
Extend kuttl-test for serviceLabels
1 parent 0c18b76 commit 29fb926

6 files changed

Lines changed: 126 additions & 0 deletions

File tree

tests/kuttl/suites/autoscaling/tests/01-assert.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,19 @@ spec:
129129
port: 8042
130130
protocol: TCP
131131
targetPort: 8042
132+
---
133+
apiVersion: keystone.openstack.org/v1beta1
134+
kind: KeystoneEndpoint
135+
metadata:
136+
labels:
137+
service: aodh
138+
name: aodh
139+
spec:
140+
serviceName: aodh
141+
---
142+
apiVersion: keystone.openstack.org/v1beta1
143+
kind: KeystoneService
144+
metadata:
145+
labels:
146+
service: aodh
147+
name: aodh

tests/kuttl/suites/ceilometer/tests/00-assert.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,3 +236,10 @@ spec:
236236
- port: 9104
237237
protocol: TCP
238238
targetPort: 9104
239+
---
240+
apiVersion: keystone.openstack.org/v1beta1
241+
kind: KeystoneService
242+
metadata:
243+
labels:
244+
service: ceilometer
245+
name: ceilometer

tests/kuttl/suites/cloudkitty/tests/01-assert.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ metadata:
55
ownerReferences:
66
- kind: CloudKitty
77
name: telemetry-kuttl-cloudkitty
8+
labels:
9+
service: cloudkitty
810
spec:
911
tenants:
1012
authentication:
@@ -67,6 +69,8 @@ metadata:
6769
ownerReferences:
6870
- kind: CloudKitty
6971
name: telemetry-kuttl-cloudkitty
72+
labels:
73+
service: cloudkitty
7074
spec:
7175
subject:
7276
organizationalUnits:
@@ -195,3 +199,21 @@ status:
195199
- name: cloudkitty-processor
196200
ready: true
197201
started: true
202+
---
203+
apiVersion: keystone.openstack.org/v1beta1
204+
kind: KeystoneEndpoint
205+
metadata:
206+
labels:
207+
component: cloudkitty-api
208+
service: cloudkitty
209+
name: cloudkitty
210+
spec:
211+
serviceName: cloudkitty
212+
---
213+
apiVersion: keystone.openstack.org/v1beta1
214+
kind: KeystoneService
215+
metadata:
216+
labels:
217+
component: cloudkitty-api
218+
service: cloudkitty
219+
name: cloudkitty

tests/kuttl/suites/logging/tests/00-assert.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ metadata:
66
metallb.universe.tf/allow-shared-ip: internalapi
77
metallb.universe.tf/loadBalancerIPs: 172.17.0.80
88
name: openstack-logging
9+
labels:
10+
service: logging
911
spec:
1012
ports:
1113
- port: 10514

tests/kuttl/suites/metricstorage/tests/01-assert.yaml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,42 @@ spec:
109109
---
110110
apiVersion: monitoring.rhobs/v1alpha1
111111
kind: ScrapeConfig
112+
metadata:
113+
labels:
114+
service: metricStorage
115+
name: telemetry-ksm
116+
ownerReferences:
117+
- kind: MetricStorage
118+
name: telemetry-kuttl
119+
spec:
120+
scrapeInterval: 30s
121+
---
122+
apiVersion: monitoring.rhobs/v1alpha1
123+
kind: ScrapeConfig
124+
metadata:
125+
labels:
126+
service: metricStorage
127+
name: telemetry-openstack-network-exporter
128+
ownerReferences:
129+
- kind: MetricStorage
130+
name: telemetry-kuttl
131+
spec:
132+
scrapeInterval: 30s
133+
---
134+
apiVersion: monitoring.rhobs/v1alpha1
135+
kind: ScrapeConfig
136+
metadata:
137+
labels:
138+
service: metricStorage
139+
name: telemetry-podman-exporter
140+
ownerReferences:
141+
- kind: MetricStorage
142+
name: telemetry-kuttl
143+
spec:
144+
scrapeInterval: 30s
145+
---
146+
apiVersion: monitoring.rhobs/v1alpha1
147+
kind: ScrapeConfig
112148
metadata:
113149
labels:
114150
service: metricStorage
@@ -200,3 +236,10 @@ kind: ConfigMap
200236
metadata:
201237
name: grafana-dashboard-openstack-network-traffic
202238
namespace: openshift-config-managed
239+
---
240+
apiVersion: v1
241+
kind: Secret
242+
metadata:
243+
name: telemetry-kuttl-prometheus-endpoint
244+
labels:
245+
service: metricStorage

tests/kuttl/suites/metricstorage/tests/04-assert.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,39 @@ metadata:
118118
name: telemetry-kuttl
119119
spec:
120120
scrapeInterval: 40s
121+
---
122+
apiVersion: monitoring.rhobs/v1alpha1
123+
kind: ScrapeConfig
124+
metadata:
125+
labels:
126+
service: metricStorage
127+
name: telemetry-ksm
128+
ownerReferences:
129+
- kind: MetricStorage
130+
name: telemetry-kuttl
131+
spec:
132+
scrapeInterval: 40s
133+
---
134+
apiVersion: monitoring.rhobs/v1alpha1
135+
kind: ScrapeConfig
136+
metadata:
137+
labels:
138+
service: metricStorage
139+
name: telemetry-openstack-network-exporter
140+
ownerReferences:
141+
- kind: MetricStorage
142+
name: telemetry-kuttl
143+
spec:
144+
scrapeInterval: 40s
145+
---
146+
apiVersion: monitoring.rhobs/v1alpha1
147+
kind: ScrapeConfig
148+
metadata:
149+
labels:
150+
service: metricStorage
151+
name: telemetry-podman-exporter
152+
ownerReferences:
153+
- kind: MetricStorage
154+
name: telemetry-kuttl
155+
spec:
156+
scrapeInterval: 40s

0 commit comments

Comments
 (0)