Skip to content

Commit f5f6817

Browse files
committed
Add kuttl jobs configuration for Prometheus integration
This patch is adjusting kuttl jobs for Prometheus integration. This includes telemetry deployment in the deps part and minor fixes in the spec to make sure the watcher deployment deployes the used CA bundle created in the controlplane.
1 parent 2003269 commit f5f6817

File tree

6 files changed

+48
-1
lines changed

6 files changed

+48
-1
lines changed

config/samples/watcher_v1beta1_watcher.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ metadata:
1010
name: watcher
1111
spec:
1212
databaseInstance: "openstack"
13+
apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
14+
decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
15+
applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
16+
tls:
17+
caBundleSecretName: "combined-ca-bundle"

tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ spec:
88
apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
99
decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
1010
applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
11+
tls:
12+
caBundleSecretName: "combined-ca-bundle"

tests/kuttl/test-suites/default/deps/infra.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ spec:
3131
cinder:
3232
enabled: false
3333
telemetry:
34-
enabled: false
34+
enabled: true

tests/kuttl/test-suites/default/deps/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ namespace: watcher-kuttl-default
55
secretGenerator:
66
- literals:
77
- AdminPassword=password
8+
- AodhPassword=password
9+
- CeilometerPassword=password
810
- DbRootPassword=password
911
- DatabasePassword=password
1012
- WatcherPassword=password
@@ -40,3 +42,4 @@ patches:
4042
secret: osp-secret
4143
- path: infra.yaml
4244
- path: keystone.yaml
45+
- path: telemetry.yaml
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: core.openstack.org/v1beta1
2+
kind: OpenStackControlPlane
3+
metadata:
4+
name: openstack
5+
spec:
6+
telemetry:
7+
template:
8+
metricStorage:
9+
enabled: true
10+
dashboardsEnabled: true
11+
monitoringStack:
12+
alertingEnabled: true
13+
scrapeInterval: 30s
14+
storage:
15+
strategy: persistent
16+
retention: 24h
17+
persistent:
18+
pvcStorageRequest: 1G
19+
autoscaling:
20+
enabled: false
21+
aodh:
22+
passwordSelectors:
23+
databaseAccount: aodh
24+
databaseInstance: openstack
25+
secret: osp-secret
26+
heatInstance: heat
27+
ceilometer:
28+
enabled: true
29+
secret: osp-secret
30+
passwordSelector:
31+
aodhService: AodhPassword
32+
ceilometerService: CeilometerPassword
33+
serviceUser: ceilometer
34+
logging:
35+
enabled: false

tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ spec:
99
apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
1010
decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
1111
applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
12+
tls:
13+
caBundleSecretName: "combined-ca-bundle"
1214
apiServiceTemplate:
1315
replicas: 2

0 commit comments

Comments
 (0)