Add kuttl tests for prometheus configuration

This patch adds some required prometheus secret for kuttl jobs to run and adds validation checks. Also, it modifies the watcher_deploy make target to create a secret so that the watcher can be deployed until the secret is created by the telemetry operator.
openstack-k8s-operators · Jan 23, 2025 · 4219449 · 4219449
1 parent b61921c
commit 4219449
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -385,11 +385,13 @@ watcher: ## Install watcher operator via olm
 
 .PHONY: watcher_deploy
 watcher_deploy: ## Deploy watcher service
+	oc apply -f config/samples/watcher_requirements.yaml
 	oc apply -f config/samples/watcher_v1beta1_watcher.yaml
 
 .PHONY: watcher_deploy_cleanup
 watcher_deploy_cleanup: ## Undeploy watcher service
 	oc delete -f config/samples/watcher_v1beta1_watcher.yaml
+	oc delete -f config/samples/watcher_requirements.yaml
 
 .PHONY: watcher_cleanup
 watcher_cleanup: export CATALOG_IMG=${CATALOG_IMAGE}

diff --git a/config/samples/watcher_requirements.yaml b/config/samples/watcher_requirements.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: metric-storage-prometheus-config
+  namespace: openstack
+stringData:
+  host: metric-storage-prometheus.openstack.svc
+  port: "9090"
+  prometheus_ca.crt: ""
diff --git a/tests/kuttl/test-suites/default/common/cleanup-errors.yaml b/tests/kuttl/test-suites/default/common/cleanup-errors.yaml
@@ -96,3 +96,13 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneEndpoint
 metadata:
   name: watcher
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: metric-storage-prometheus-config
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: custom-prometheus-config
diff --git a/tests/kuttl/test-suites/default/common/cleanup-watcher.yaml b/tests/kuttl/test-suites/default/common/cleanup-watcher.yaml
@@ -4,3 +4,9 @@ delete:
 - apiVersion: watcher.openstack.org/v1beta1
   kind: Watcher
   name: watcher-kuttl
+- apiVersion: v1
+  kind: Secret
+  name: metric-storage-prometheus-config
+- apiVersion: v1
+  kind: Secret
+  name: custom-prometheus-config
diff --git a/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml b/tests/kuttl/test-suites/default/common/deploy-with-defaults.yaml
@@ -1,3 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: metric-storage-prometheus-config
+  namespace: watcher-kuttl-default
+stringData:
+  host: metric-storage-prometheus.watcher-kuttl-default.svc
+  port: "9090"
+  prometheus_ca.crt: ""
+---
 apiVersion: watcher.openstack.org/v1beta1
 kind: Watcher
 metadata:

diff --git a/tests/kuttl/test-suites/default/watcher-api-service-override/01-deploy-with-defaults.yaml b/tests/kuttl/test-suites/default/watcher-api-service-override/01-deploy-with-defaults.yaml
@@ -1,3 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: metric-storage-prometheus-config
+  namespace: watcher-kuttl-default
+stringData:
+  host: metric-storage-prometheus.watcher-kuttl-default.svc
+  port: "9090"
+  prometheus_ca.crt: ""
+---
 apiVersion: watcher.openstack.org/v1beta1
 kind: Watcher
 metadata:

diff --git a/tests/kuttl/test-suites/default/watcher/01-assert.yaml b/tests/kuttl/test-suites/default/watcher/01-assert.yaml
@@ -20,6 +20,7 @@ spec:
   apiServiceTemplate:
     replicas: 1
     resources: {}
+  prometheusSecret: metric-storage-prometheus-config
 status:
   apiServiceReadyCount: 1
   conditions:

diff --git a/tests/kuttl/test-suites/default/watcher/04-assert.yaml b/tests/kuttl/test-suites/default/watcher/04-assert.yaml
@@ -243,6 +243,7 @@ commands:
       if [ -n "${APIPOD}" ]; then
         [ $(echo $(oc rsh -c watcher-api ${APIPOD} cat /etc/watcher/watcher.conf.d/01-global-custom.conf) |grep -c "^# Global config") == 1 ]
         [ $(echo $(oc rsh -c watcher-api ${APIPOD} cat /etc/watcher/watcher.conf.d/02-service-custom.conf) |grep -c "^# Service config") == 1 ]
+        [ $(echo $(oc rsh -c watcher-api ${APIPOD} cat /etc/watcher/watcher.conf.d/00-default.conf) |grep -czPo '\[prometheus_client\]\s+host\s+=\s+metric-storage-prometheus.watcher-kuttl-default.svc\s+port\s+=\s+9090') == 1 ]
       else
         exit 1
       fi
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
@@ -1,3 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: custom-prometheus-config
+  namespace: watcher-kuttl-default
+stringData:
+  host: metric-storage-prometheus.watcher-kuttl-default.svc
+  port: "9090"
+  prometheus_ca.crt: ""
+---
 apiVersion: watcher.openstack.org/v1beta1
 kind: Watcher
 metadata:
@@ -6,6 +16,7 @@ metadata:
 spec:
   databaseInstance: "openstack"
   databaseAccount: watcher-precreated
+  prometheusSecret: custom-prometheus-config
   tls:
     caBundleSecretName: "combined-ca-bundle"
   customServiceConfig: |