From 77fae428591d3d5be3b9da21e5da246d1933489f Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Tue, 18 Jun 2024 11:42:03 +0200 Subject: [PATCH] update finalzier to CRD doc Signed-off-by: Martin Schuppert --- api/go.mod | 2 ++ api/go.sum | 4 ++-- go.mod | 4 ++++ go.sum | 8 ++++---- test/functional/manila_controller_test.go | 9 +++++---- test/kuttl/tests/manila-basic/02-assert.yaml | 2 +- test/kuttl/tests/manila-multibackend/02-assert.yaml | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/api/go.mod b/api/go.mod index 58c2a1bc..0c013843 100644 --- a/api/go.mod +++ b/api/go.mod @@ -70,3 +70,5 @@ require ( // mschuppert: map to latest commit from release-4.13 tag // must consistent within modules and service operators replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging + +replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20240618070955-1d6e4fd1b656 diff --git a/api/go.sum b/api/go.sum index c34fc3af..6bb4f9e6 100644 --- a/api/go.sum +++ b/api/go.sum @@ -65,8 +65,6 @@ 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/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= @@ -87,6 +85,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stuggi/lib-common/modules/common v0.0.0-20240618070955-1d6e4fd1b656 h1:0H6V4Yoh2tM/YfRJPMOKd2W2zlDZYs8UOHhoSrjTyAk= +github.com/stuggi/lib-common/modules/common v0.0.0-20240618070955-1d6e4fd1b656/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= diff --git a/go.mod b/go.mod index 199baafd..9a901920 100644 --- a/go.mod +++ b/go.mod @@ -91,3 +91,7 @@ replace github.com/openstack-k8s-operators/manila-operator/api => ./api // mschuppert: map to latest commit from release-4.13 tag // must consistent within modules and service operators replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging + +replace github.com/openstack-k8s-operators/lib-common/modules/common => github.com/stuggi/lib-common/modules/common v0.0.0-20240618070955-1d6e4fd1b656 + +replace github.com/openstack-k8s-operators/mariadb-operator/api => github.com/stuggi/mariadb-operator/api v0.0.0-20240618071652-676683c1fbba diff --git a/go.sum b/go.sum index fb893548..5d2ca8a3 100644 --- a/go.sum +++ b/go.sum @@ -78,16 +78,12 @@ 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/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/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= @@ -106,6 +102,10 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stuggi/lib-common/modules/common v0.0.0-20240618070955-1d6e4fd1b656 h1:0H6V4Yoh2tM/YfRJPMOKd2W2zlDZYs8UOHhoSrjTyAk= +github.com/stuggi/lib-common/modules/common v0.0.0-20240618070955-1d6e4fd1b656/go.mod h1:k9KuWN2LBtLbKHgcyh/0lrwk3Kr0cOAhiR3hi/mrwOQ= +github.com/stuggi/mariadb-operator/api v0.0.0-20240618071652-676683c1fbba h1:BQzhBLcwRPY1NRwDpVFJfPzjT2jNNvFyJQXCLBkwgC4= +github.com/stuggi/mariadb-operator/api v0.0.0-20240618071652-676683c1fbba/go.mod h1:61AJvbfu45ZofuPO5GCb8akTxXQJD8XEv7TBYDB0/2o= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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