From ee030cf704f5352ce6808f3bc33691d3e74c4892 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Wed, 30 Oct 2024 11:47:50 +1000 Subject: [PATCH] Enable Heat in functional tests This change enables the Heat service in the openstackcontrolplane functional tests. It ensures webhook logic is evaluated to avoid any potential nil pointer derefs and that we can validate the route annotations are applied. Signed-off-by: Brendan Shephard --- tests/functional/ctlplane/base_test.go | 11 +++++++++++ .../ctlplane/openstackversion_controller_test.go | 3 +++ 2 files changed, 14 insertions(+) diff --git a/tests/functional/ctlplane/base_test.go b/tests/functional/ctlplane/base_test.go index 1aa8eb899..e114bdb2e 100644 --- a/tests/functional/ctlplane/base_test.go +++ b/tests/functional/ctlplane/base_test.go @@ -409,6 +409,13 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} { ironicTemplate := map[string]interface{}{ "ironicConductors": []interface{}{}, } + heatTemplate := map[string]interface{}{ + "databaseInstance": "openstack", + "secret": "osp-secret", + "passwordSelectors": map[string]interface{}{ + "AuthEncryptionKey": "HeatAuthEncryptionKey", + }, + } return map[string]interface{}{ "secret": "osp-secret", @@ -472,6 +479,10 @@ func GetDefaultOpenStackControlPlaneSpec() map[string]interface{} { "manila": map[string]interface{}{ "enabled": true, }, + "heat": map[string]interface{}{ + "enabled": true, + "template": heatTemplate, + }, } } diff --git a/tests/functional/ctlplane/openstackversion_controller_test.go b/tests/functional/ctlplane/openstackversion_controller_test.go index 1b5545554..abaae1ca1 100644 --- a/tests/functional/ctlplane/openstackversion_controller_test.go +++ b/tests/functional/ctlplane/openstackversion_controller_test.go @@ -227,6 +227,9 @@ var _ = Describe("OpenStackOperator controller", func() { spec["manila"] = map[string]interface{}{ "enabled": false, } + spec["heat"] = map[string]interface{}{ + "enabled": false, + } spec["tls"] = GetTLSPublicSpec() spec["ovn"] = map[string]interface{}{ "enabled": true,