diff --git a/api/go.mod b/api/go.mod index 58c2a1bc..59f420ff 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,7 +3,7 @@ module github.com/openstack-k8s-operators/manila-operator/api go 1.20 require ( - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 k8s.io/api v0.28.11 k8s.io/apimachinery v0.28.11 diff --git a/api/go.sum b/api/go.sum index c34fc3af..8907dcc0 100644 --- a/api/go.sum +++ b/api/go.sum @@ -65,8 +65,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 h1:h10bPourbXsIN7p5M//SUly/UzWfEp+d5tloBnyDDMI= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d h1:t1Lvt1WGp/WbkdU5R7nsc0NtMAvfd0K1nlNYLprHhbQ= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 h1:HzOM/miWApJGfZhctTZICbbcKDZUls9o1Z1UWuO79PM= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658/go.mod h1:v9iFrR8J5fZACS9W5pZau/4lwyWs/YmO4ezpDeoEFKU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/go.mod b/go.mod index 199baafd..7f50db5c 100644 --- a/go.mod +++ b/go.mod @@ -8,11 +8,11 @@ require ( github.com/onsi/gomega v1.33.1 github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-996e41d1af19 github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240605055850-8ee0ece70906 - github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 + github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240615134235-24529fcff658 github.com/openstack-k8s-operators/manila-operator/api v0.0.0-00010101000000-000000000000 - github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240613130956-7d997dc5d972 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61 k8s.io/api v0.28.11 k8s.io/apimachinery v0.28.11 k8s.io/client-go v0.28.11 diff --git a/go.sum b/go.sum index fb893548..e2048c18 100644 --- a/go.sum +++ b/go.sum @@ -78,16 +78,16 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-9 github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-996e41d1af19/go.mod h1:7y2IQWFqkyCZb2CVfYzI0N9YRPUgEeGAgjxvOFvhRpo= github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240605055850-8ee0ece70906 h1:sq7CD7w44uAs+5Yd5wX1TgZR2vyMKY3YN6iddCJwz8M= github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240605055850-8ee0ece70906/go.mod h1:GWJdAtjPUEwNFbRKwlXkeTHMiGCqySE4qJo0fKZSayo= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658 h1:h10bPourbXsIN7p5M//SUly/UzWfEp+d5tloBnyDDMI= -github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240615134235-24529fcff658/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d h1:t1Lvt1WGp/WbkdU5R7nsc0NtMAvfd0K1nlNYLprHhbQ= +github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240618142732-ec81334ac10d/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240615134235-24529fcff658 h1:Vb2WhryohIhyeG55z3HDG3R5hk4ipvAYRxAOUgYrOlI= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240615134235-24529fcff658/go.mod h1:zuPcZ5Kopr15AdfxvA0xqKIIGCZ0XbSe/0VHNKuvbEE= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658 h1:HzOM/miWApJGfZhctTZICbbcKDZUls9o1Z1UWuO79PM= github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240615134235-24529fcff658/go.mod h1:v9iFrR8J5fZACS9W5pZau/4lwyWs/YmO4ezpDeoEFKU= github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240615134235-24529fcff658 h1:E3v5us2zv+9bRj+8t9Lk0+QpC6t1KSgVsDuzv+7RiMQ= github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240615134235-24529fcff658/go.mod h1:0h76CxD9g0z2Hk7fGFOZcjnzT1tQQ/yRNv3OXng+S/A= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240613130956-7d997dc5d972 h1:Qxoz8FxaaTOpH/Mus/8RPbZ3Ky+gsZXOpNjp7xFHxok= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240613130956-7d997dc5d972/go.mod h1:MyDbpztq0ZB0X5sIR+SrXTmfKqBswztAz2AmdKOiHV4= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61 h1:D2Yk4HW54k9zUn9FBQqr3HRm6ta2rTjFc3yqExkyr+o= +github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61/go.mod h1:HWwqZr9qI121evs7+M7AEO1qqIHY43roDsDrOnbjEMM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/test/functional/manila_controller_test.go b/test/functional/manila_controller_test.go index b0826644..de367ee1 100644 --- a/test/functional/manila_controller_test.go +++ b/test/functional/manila_controller_test.go @@ -22,6 +22,7 @@ import ( . "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports . "github.com/onsi/gomega" //revive:disable:dot-imports "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + //revive:disable-next-line:dot-imports . "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers" mariadb_test "github.com/openstack-k8s-operators/mariadb-operator/api/test/helpers" @@ -107,7 +108,7 @@ var _ = Describe("Manila controller", func() { // it to run Eventually(func() []string { return GetManila(manilaTest.Instance).Finalizers - }, timeout, interval).Should(ContainElement("Manila")) + }, timeout, interval).Should(ContainElement("openstack.org/manila")) }) It("creates service account, role and rolebindig", func() { @@ -323,12 +324,12 @@ var _ = Describe("Manila controller", func() { keystone.SimulateKeystoneServiceReady(manilaTest.Instance) mDB := mariadb.GetMariaDBDatabase(manilaTest.ManilaDatabaseName) - Expect(mDB.Finalizers).To(ContainElement("Manila")) + Expect(mDB.Finalizers).To(ContainElement("openstack.org/manila")) th.DeleteInstance(GetManila(manilaTest.Instance)) mDB = mariadb.GetMariaDBDatabase(manilaTest.ManilaDatabaseName) - Expect(mDB.Finalizers).NotTo(ContainElement("Manila")) + Expect(mDB.Finalizers).NotTo(ContainElement("openstack.org/manila")) }) }) When("Manila CR instance is built with NAD", func() { @@ -657,7 +658,7 @@ var _ = Describe("Manila controller", func() { "Manila", manilaTest.Instance.Namespace, manilaTest.Instance.Name, - "Manila", + "openstack.org/manila", mariadb, timeout, interval, ) }, diff --git a/test/kuttl/tests/manila-basic/02-assert.yaml b/test/kuttl/tests/manila-basic/02-assert.yaml index 7bfe8fa5..61eda78f 100644 --- a/test/kuttl/tests/manila-basic/02-assert.yaml +++ b/test/kuttl/tests/manila-basic/02-assert.yaml @@ -123,7 +123,7 @@ apiVersion: manila.openstack.org/v1beta1 kind: ManilaAPI metadata: finalizers: - - ManilaAPI + - openstack.org/manilaapi name: manila-api spec: databaseHostname: openstack.manila-kuttl-tests.svc diff --git a/test/kuttl/tests/manila-multibackend/02-assert.yaml b/test/kuttl/tests/manila-multibackend/02-assert.yaml index 4cf63d1e..2d12309d 100644 --- a/test/kuttl/tests/manila-multibackend/02-assert.yaml +++ b/test/kuttl/tests/manila-multibackend/02-assert.yaml @@ -136,7 +136,7 @@ apiVersion: manila.openstack.org/v1beta1 kind: ManilaAPI metadata: finalizers: - - ManilaAPI + - openstack.org/manilaapi name: manila-api spec: databaseAccount: manila