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.
openstack-k8s-operators · Jan 17, 2025 · f5f6817 · f5f6817
1 parent 2003269
commit f5f6817
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 1 deletion.
diff --git a/config/samples/watcher_v1beta1_watcher.yaml b/config/samples/watcher_v1beta1_watcher.yaml
@@ -10,3 +10,8 @@ metadata:
   name: watcher
 spec:
   databaseInstance: "openstack"
+  apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
+  decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
+  applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
+  tls:
+    caBundleSecretName: "combined-ca-bundle"
diff --git a/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml b/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml
@@ -8,3 +8,5 @@ spec:
   apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
   decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
   applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
+  tls:
+    caBundleSecretName: "combined-ca-bundle"
diff --git a/tests/kuttl/test-suites/default/deps/infra.yaml b/tests/kuttl/test-suites/default/deps/infra.yaml
@@ -31,4 +31,4 @@ spec:
   cinder:
     enabled: false
   telemetry:
-    enabled: false
+    enabled: true
diff --git a/tests/kuttl/test-suites/default/deps/kustomization.yaml b/tests/kuttl/test-suites/default/deps/kustomization.yaml
@@ -5,6 +5,8 @@ namespace: watcher-kuttl-default
 secretGenerator:
 - literals:
   - AdminPassword=password
+  - AodhPassword=password
+  - CeilometerPassword=password
   - DbRootPassword=password
   - DatabasePassword=password
   - WatcherPassword=password
@@ -40,3 +42,4 @@ patches:
       secret: osp-secret
 - path: infra.yaml
 - path: keystone.yaml
+- path: telemetry.yaml
diff --git a/tests/kuttl/test-suites/default/deps/telemetry.yaml b/tests/kuttl/test-suites/default/deps/telemetry.yaml
@@ -0,0 +1,35 @@
+apiVersion: core.openstack.org/v1beta1
+kind: OpenStackControlPlane
+metadata:
+  name: openstack
+spec:
+  telemetry:
+    template:
+      metricStorage:
+        enabled: true
+        dashboardsEnabled: true
+        monitoringStack:
+          alertingEnabled: true
+          scrapeInterval: 30s
+          storage:
+            strategy: persistent
+            retention: 24h
+            persistent:
+              pvcStorageRequest: 1G
+      autoscaling:
+        enabled: false
+        aodh:
+          passwordSelectors:
+          databaseAccount: aodh
+          databaseInstance: openstack
+          secret: osp-secret
+        heatInstance: heat
+      ceilometer:
+        enabled: true
+        secret: osp-secret
+        passwordSelector:
+          aodhService: AodhPassword
+          ceilometerService: CeilometerPassword
+        serviceUser: ceilometer
+      logging:
+        enabled: false
diff --git a/tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml b/tests/kuttl/test-suites/default/watcher/04-deploy-with-precreated-account.yaml
@@ -9,5 +9,7 @@ spec:
   apiContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-api:current-podified"
   decisionengineContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-decision-engine:current-podified"
   applierContainerImageURL: "quay.io/podified-master-centos9/openstack-watcher-applier:current-podified"
+  tls:
+    caBundleSecretName: "combined-ca-bundle"
   apiServiceTemplate:
     replicas: 2