diff --git a/go.mod b/go.mod index 90faa3a9..a18a8ee4 100644 --- a/go.mod +++ b/go.mod @@ -95,3 +95,7 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202304141430 // needed to to cert-manager v1.11.4 see https://github.com/cert-manager/cert-manager/blob/v1.11.4/go.mod#L263C1-L264C104 // remove this once we bump to cert-manager v1.12.x replace github.com/Venafi/vcert/v4 => github.com/jetstack/vcert/v4 v4.9.6-0.20230519122548-219f317ae107 //allow-merging + +replace github.com/openstack-k8s-operators/mariadb-operator/api => github.com/gibizer/mariadb-operator/api v0.0.0-20230927125835-d928d57aebb5 + +replace github.com/openstack-k8s-operators/lib-common/modules/test => github.com/gibizer/lib-common/modules/test v0.0.0-20230928090455-81c3333b6889 diff --git a/go.sum b/go.sum index b5194921..99ca4892 100644 --- a/go.sum +++ b/go.sum @@ -38,6 +38,10 @@ github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gibizer/lib-common/modules/test v0.0.0-20230928090455-81c3333b6889 h1:9mfkwtby6sN7MQUOPK3bNyvMRP/qIpetnQZYgXPeWqQ= +github.com/gibizer/lib-common/modules/test v0.0.0-20230928090455-81c3333b6889/go.mod h1:i+7ijhNyqcPBBzYf4BvnNBzYrYvu9B2BHSEoQOR+FMk= +github.com/gibizer/mariadb-operator/api v0.0.0-20230927125835-d928d57aebb5 h1:Y7jf9PMuPk7omjPH5NINR3vlxdAJwsXqzCbEc6Qpy4k= +github.com/gibizer/mariadb-operator/api v0.0.0-20230927125835-d928d57aebb5/go.mod h1:xhiz5wFdKWwVM7BF/VYon4TT3NuUPXp/Pyn2hWcp0CE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= @@ -141,10 +145,6 @@ github.com/openstack-k8s-operators/lib-common/modules/database v0.1.1-0.20230927 github.com/openstack-k8s-operators/lib-common/modules/database v0.1.1-0.20230927082538-4f614f333d17/go.mod h1:RroLfB6Wstc+z7JVJY9o+6YPu+wBIzTAAfMpwhv7pDI= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230927082538-4f614f333d17 h1:d3HP0nEGNd8cQ088beQbyWzcgdMppD+Zs8HeoMdzRws= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.1-0.20230927082538-4f614f333d17/go.mod h1:+iJZo5alCeOGD/524hWWdlINA6zqY+MjfWT7cDcbvBE= -github.com/openstack-k8s-operators/lib-common/modules/test v0.1.2-0.20230927082538-4f614f333d17 h1:zJguNin+9IwRnGKy1A7ranxASKO1vTvWxoXwkCz8MWw= -github.com/openstack-k8s-operators/lib-common/modules/test v0.1.2-0.20230927082538-4f614f333d17/go.mod h1:YOFHrNK/QqCvZUPlDJYmDyaCkbKIB98V04uyofiC9a8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230918111825-8999b3b2dc3c h1:9R8T1WRwuPS5KMfsQWxAMSGPuJrGMJ7bODKK9dirhHA= -github.com/openstack-k8s-operators/mariadb-operator/api v0.1.1-0.20230918111825-8999b3b2dc3c/go.mod h1:xXHF/R/L0XamRHR/UkzlgzSTocBQ6GSQ2U16Q9Mf/bA= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/tests/functional/heat_controller_test.go b/tests/functional/heat_controller_test.go index d3907840..f0556c4d 100644 --- a/tests/functional/heat_controller_test.go +++ b/tests/functional/heat_controller_test.go @@ -334,8 +334,8 @@ var _ = Describe("Heat controller", func() { keystoneAPI := keystone.CreateKeystoneAPI(namespace) DeferCleanup(keystone.DeleteKeystoneAPI, keystoneAPI) DeferCleanup( - th.DeleteDBService, - th.CreateDBService( + mariadb.DeleteDBService, + mariadb.CreateDBService( namespace, GetHeat(heatName).Spec.DatabaseInstance, corev1.ServiceSpec{ @@ -343,7 +343,7 @@ var _ = Describe("Heat controller", func() { }, ), ) - th.SimulateMariaDBDatabaseCompleted(heatName) + mariadb.SimulateMariaDBDatabaseCompleted(heatName) }) It("should have db ready condition", func() { @@ -390,8 +390,8 @@ var _ = Describe("Heat controller", func() { keystoneAPI := keystone.CreateKeystoneAPI(namespace) DeferCleanup(keystone.DeleteKeystoneAPI, keystoneAPI) DeferCleanup( - th.DeleteDBService, - th.CreateDBService( + mariadb.DeleteDBService, + mariadb.CreateDBService( namespace, GetHeat(heatName).Spec.DatabaseInstance, corev1.ServiceSpec{ @@ -399,7 +399,7 @@ var _ = Describe("Heat controller", func() { }, ), ) - th.SimulateMariaDBDatabaseCompleted(heatName) + mariadb.SimulateMariaDBDatabaseCompleted(heatName) dbSyncJobName := types.NamespacedName{ Name: "heat-db-sync", Namespace: namespace, diff --git a/tests/functional/suite_test.go b/tests/functional/suite_test.go index 2699330e..08c7194c 100644 --- a/tests/functional/suite_test.go +++ b/tests/functional/suite_test.go @@ -31,6 +31,7 @@ import ( "github.com/openstack-k8s-operators/heat-operator/controllers" keystone_test "github.com/openstack-k8s-operators/keystone-operator/api/test/helpers" common_test "github.com/openstack-k8s-operators/lib-common/modules/test/helpers" + mariadb_test "github.com/openstack-k8s-operators/mariadb-operator/api/test/helpers" //+kubebuilder:scaffold:imports ) @@ -46,6 +47,7 @@ var ( logger logr.Logger th *common_test.TestHelper keystone *keystone_test.TestHelper + mariadb *mariadb_test.TestHelper namespace string ) @@ -122,7 +124,9 @@ var _ = BeforeSuite(func() { th = common_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger) Expect(th).NotTo(BeNil()) keystone = keystone_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger) - Expect(th).NotTo(BeNil()) + Expect(keystone).NotTo(BeNil()) + mariadb = mariadb_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger) + Expect(mariadb).NotTo(BeNil()) // Start the controller-manager if goroutine webhookInstallOptions := &testEnv.WebhookInstallOptions