KUTTL tests for Ceilometer and Telemetry API

Makefile

@@ -333,7 +333,7 @@ kuttl-install:
 	echo "Place 'export PATH=$${KREW_ROOT:-$$HOME/.krew}/bin:$$PATH' to your ~/.bashrc"
 
 # TODO(mmagr): change this to default once there is default suite
-KUTTL_SUITE ?= autoscaling
+KUTTL_SUITE ?= default
 KUTTL_NAMESPACE ?= telemetry-kuttl-$(KUTTL_SUITE)
 KUTTL_SUITE_DIR ?= tests/kuttl/suites/$(KUTTL_SUITE)
 
@@ -361,6 +361,12 @@ kuttl-test-cleanup:
 		if [ "$(KUTTL_SUITE)" == "autoscaling" ]; then \
 			oc delete --wait=true --all=true -n $(KUTTL_NAMESPACE) --timeout=120s Autoscaling; \
 		fi; \
+		if [ "$(KUTTL_SUITE)" == "ceilometer" ]; then \
+			oc delete --wait=true --all=true -n $(KUTTL_NAMESPACE) --timeout=120s Ceilometer; \
+		fi; \
+		if [ "$(KUTTL_SUITE)" == "default" ]; then \
+			oc delete --wait=true --all=true -n $(KUTTL_NAMESPACE) --timeout=120s Telemetry; \
+		fi; \
 		oc delete --wait=true --all=true -n $(KUTTL_NAMESPACE) --timeout=120s OpenStackControlPlane; \
 		oc delete --wait=true namespace $(KUTTL_NAMESPACE); \
 	else \

kuttl-test.yaml

@@ -21,5 +21,7 @@ timeout: 300
 parallel: 1
 testDirs:
   - tests/kuttl/suites/autoscaling/
+  - tests/kuttl/suites/ceilometer/
+  - tests/kuttl/suites/default/
 suppress:
   - events                     # Remove spammy event logs

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

@@ -6,16 +6,13 @@ metadata:
   name: prometheus-telemetry-kuttl-prometheus-0
 status:
   containerStatuses:
-  - image: quay.io/rhobs/obo-prometheus-config-reloader:v0.68.0-rhobs1
-    name: config-reloader
+  - name: config-reloader
     ready: true
     started: true
-  - image: quay.io/prometheus/prometheus:v2.47.0
-    name: prometheus
+  - name: prometheus
     ready: true
     started: true
-  - image: quay.io/thanos/thanos:v0.24.0
-    name: thanos-sidecar
+  - name: thanos-sidecar
     ready: true
     started: true
 ---
@@ -80,14 +77,10 @@ spec:
   template:
     spec:
       containers:
-      - image: quay.io/mmagr/openstack-aodh-api:current-podified
-        name: aodh-api
-      - image: quay.io/mmagr/openstack-aodh-evaluator:current-podified
-        name: aodh-evaluator
-      - image: quay.io/mmagr/openstack-aodh-notifier:current-podified
-        name: aodh-notifier
-      - image: quay.io/mmagr/openstack-aodh-listener:current-podified
-        name: aodh-listener
+      - name: aodh-api
+      - name: aodh-evaluator
+      - name: aodh-notifier
+      - name: aodh-listener
       volumes:
       - name: scripts
         secret:

tests/kuttl/suites/ceilometer/config.yaml

@@ -0,0 +1,14 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestSuite
+reportFormat: JSON
+reportName: kuttl-ceilometer-results
+namespace: telemetry-kuttl-ceilometer
+# we could set this lower, but the initial image pull can take a while
+timeout: 300
+parallel: 1
+skipDelete: true
+testDirs:
+  - tests/kuttl/suites/ceilometer/
+suppress:
+  - events
+artifactsDir: tests/kuttl/suites/ceilometer/output

tests/kuttl/suites/ceilometer/deps/OpenStackControlPlane.yaml

@@ -0,0 +1,26 @@
+apiVersion: core.openstack.org/v1beta1
+kind: OpenStackControlPlane
+metadata:
+  name: openstack
+spec:
+  storageClass: "crc-csi-hostpath-provisioner"
+  keystone:
+    template:
+      databaseInstance: openstack
+      secret: osp-secret
+  ironic:
+    enabled: false
+    template:
+      ironicConductors: []
+  manila:
+    enabled: false
+    template:
+      manilaShares: {}
+  horizon:
+    enabled: false
+  nova:
+    enabled: false
+  placement:
+    template:
+      databaseInstance: openstack
+      secret: osp-secret

tests/kuttl/suites/ceilometer/deps/infra.yaml

@@ -0,0 +1,41 @@
+apiVersion: core.openstack.org/v1beta1
+kind: OpenStackControlPlane
+metadata:
+  name: openstack
+spec:
+  mariadb:
+    enabled: false
+    templates:
+      openstack:
+        replicas: 0
+      openstack-cell1:
+        replicas: 0
+  galera:
+    enabled: true
+    templates:
+      openstack:
+        replicas: 1
+        storageRequest: 500M
+      openstack-cell1:
+        replicas: 1
+        storageRequest: 500M
+        secret: osp-secret
+    secret: osp-secret
+  rabbitmq:
+    templates:
+      rabbitmq:
+        replicas: 1
+      rabbitmq-cell1:
+        replicas: 1
+  memcached:
+    templates:
+      memcached:
+        replicas: 1
+  ovn:
+    enabled: false
+    template:
+      ovnController:
+        external-ids:
+          ovn-encap-type: geneve
+  ovs:
+    enabled: false

tests/kuttl/suites/ceilometer/deps/kustomization.yaml

@@ -0,0 +1,45 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: telemetry-kuttl-ceilometer
+
+secretGenerator:
+- literals:
+  - AdminPassword=password
+  - DbRootPassword=password
+  - DatabasePassword=password
+  - KeystoneDatabasePassword=password
+  - PlacementPassword=password
+  - PlacementDatabasePassword=password
+  - GlancePassword=password
+  - GlanceDatabasePassword=password
+  - NeutronPassword=password
+  - NeutronDatabasePassword=password
+  - NovaPassword=password
+  - NovaAPIDatabasePassword=password
+  - NovaCell0DatabasePassword=password
+  - NovaCell1DatabasePassword=password
+  - AodhPassword=password
+  - AodhDatabasePassword=password
+  - CeilometerPassword=password
+  - CeilometerDatabasePassword=password
+  - MetadataSecret=42
+  name: osp-secret
+generatorOptions:
+  disableNameSuffixHash: true
+  labels:
+    type: osp-secret
+
+resources:
+- namespace.yaml
+- OpenStackControlPlane.yaml
+
+patches:
+- patch: |-
+    apiVersion: core.openstack.org/v1beta1
+    kind: OpenStackControlPlane
+    metadata:
+      name: openstack
+    spec:
+      secret: osp-secret
+- path: infra.yaml
+- path: telemetry.yaml

tests/kuttl/suites/ceilometer/deps/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: telemetry-kuttl

tests/kuttl/suites/ceilometer/deps/telemetry.yaml

@@ -0,0 +1,7 @@
+apiVersion: core.openstack.org/v1beta1
+kind: OpenStackControlPlane
+metadata:
+  name: openstack
+spec:
+  telemetry:
+    enabled: false

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

@@ -0,0 +1,47 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    service: ceilometer
+  name: ceilometer
+  ownerReferences:
+  - kind: Ceilometer
+    name: telemetry-kuttl
+spec:
+  ports:
+  - port: 3000
+    protocol: TCP
+    targetPort: 3000
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    service: ceilometer
+  name: ceilometer
+  ownerReferences:
+  - kind: Ceilometer
+    name: telemetry-kuttl
+spec:
+  template:
+    spec:
+      containers:
+      - name: ceilometer-central-agent
+      - name: ceilometer-notification-agent
+      - name: sg-core
+      volumes:
+      - name: scripts
+        secret:
+          defaultMode: 480
+          secretName: ceilometer-scripts
+      - name: config-data
+        secret:
+          defaultMode: 416
+          secretName: ceilometer-config-data
+      - name: sg-core-conf-yaml
+        secret:
+          defaultMode: 416
+          items:
+          - key: sg-core.conf.yaml
+            path: sg-core.conf.yaml
+          secretName: ceilometer-config-data

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

@@ -0,0 +1,6 @@
+apiVersion: telemetry.openstack.org/v1beta1
+kind: Ceilometer
+metadata:
+  name: telemetry-kuttl
+spec:
+  secret: osp-secret

tests/kuttl/suites/default/config.yaml

@@ -0,0 +1,14 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestSuite
+reportFormat: JSON
+reportName: kuttl-telemetry-results
+namespace: telemetry-kuttl-default
+# we could set this lower, but the initial image pull can take a while
+timeout: 300
+parallel: 1
+skipDelete: true
+testDirs:
+  - tests/kuttl/suites/default/
+suppress:
+  - events
+artifactsDir: tests/kuttl/suites/default/output

tests/kuttl/suites/default/deps/OpenStackControlPlane.yaml

@@ -0,0 +1,35 @@
+apiVersion: core.openstack.org/v1beta1
+kind: OpenStackControlPlane
+metadata:
+  name: openstack
+spec:
+  storageClass: "crc-csi-hostpath-provisioner"
+  keystone:
+    template:
+      databaseInstance: openstack
+      secret: osp-secret
+  ironic:
+    enabled: false
+    template:
+      ironicConductors: []
+  manila:
+    enabled: false
+    template:
+      manilaShares: {}
+  horizon:
+    enabled: false
+  nova:
+    enabled: false
+  placement:
+    template:
+      databaseInstance: openstack
+      secret: osp-secret
+  heat:
+    enabled: true
+    template:
+      databaseInstance: openstack
+      heatAPI:
+        replicas: 1
+      heatEngine:
+        replicas: 1
+      secret: osp-secret

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

@@ -0,0 +1,41 @@
+apiVersion: core.openstack.org/v1beta1
+kind: OpenStackControlPlane
+metadata:
+  name: openstack
+spec:
+  mariadb:
+    enabled: false
+    templates:
+      openstack:
+        replicas: 0
+      openstack-cell1:
+        replicas: 0
+  galera:
+    enabled: true
+    templates:
+      openstack:
+        replicas: 1
+        storageRequest: 500M
+      openstack-cell1:
+        replicas: 1
+        storageRequest: 500M
+        secret: osp-secret
+    secret: osp-secret
+  rabbitmq:
+    templates:
+      rabbitmq:
+        replicas: 1
+      rabbitmq-cell1:
+        replicas: 1
+  memcached:
+    templates:
+      memcached:
+        replicas: 1
+  ovn:
+    enabled: false
+    template:
+      ovnController:
+        external-ids:
+          ovn-encap-type: geneve
+  ovs:
+    enabled: false