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.

Author: amoralej

Makefile

@@ -404,7 +404,7 @@ KUTTL_SUITE_DIR ?= tests/kuttl/test-suites/$(KUTTL_SUITE)
 .PHONY: kuttl-test-prep
 kuttl-test-prep:
 	oc apply -k $(KUTTL_SUITE_DIR)/deps/ --timeout=120s
-	oc wait -n $(KUTTL_NAMESPACE) openstackcontrolplane openstack --for condition=Ready --timeout=300s
+	oc wait -n $(KUTTL_NAMESPACE) openstackcontrolplane openstack --for condition=Ready --timeout=500s
 
 .PHONY: kuttl-test-run
 kuttl-test-run:

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"

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

@@ -5,3 +5,5 @@ metadata:
   namespace: watcher-kuttl-default
 spec:
   databaseInstance: "openstack"
+  tls:
+    caBundleSecretName: "combined-ca-bundle"

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

@@ -31,4 +31,4 @@ spec:
   cinder:
     enabled: false
   telemetry:
-    enabled: false
+    enabled: true

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

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

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

@@ -6,5 +6,7 @@ metadata:
 spec:
   databaseInstance: "openstack"
   databaseAccount: watcher-precreated
+  tls:
+    caBundleSecretName: "combined-ca-bundle"
   apiServiceTemplate:
     replicas: 2