update finalzier to CRD doc

Depends-On: openstack-k8s-operators/lib-common#519 Depends-On: openstack-k8s-operators/mariadb-operator#231 Signed-off-by: Martin Schuppert <[email protected]>
stuggi · Jun 19, 2024 · 4fdc3d5 · 4fdc3d5
1 parent 1560412
commit 4fdc3d5
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 25 deletions.
diff --git a/api/go.mod b/api/go.mod
@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	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
 	k8s.io/api v0.28.11
 	k8s.io/apimachinery v0.28.11
 	k8s.io/client-go v0.28.11

diff --git a/api/go.sum b/api/go.sum
@@ -81,8 +81,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
 github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
 github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI=
 github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4=
-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/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/go.mod b/go.mod
@@ -11,9 +11,9 @@ require (
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-996e41d1af19
 	github.com/openstack-k8s-operators/ironic-operator/api v0.0.0-00010101000000-000000000000
 	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/test v0.3.1-0.20240615134235-24529fcff658
-	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
@@ -78,14 +78,14 @@ 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/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/tests/functional/ironic_controller_test.go b/tests/functional/ironic_controller_test.go
@@ -95,7 +95,7 @@ var _ = Describe("Ironic controller", func() {
 		It("should have a finalizer", func() {
 			Eventually(func() []string {
 				return GetIronic(ironicNames.IronicName).Finalizers
-			}, timeout, interval).Should(ContainElement("Ironic"))
+			}, timeout, interval).Should(ContainElement("openstack.org/ironic"))
 		})
 		It("creates service account, role and rolebindig", func() {
 			th.ExpectCondition(
@@ -235,7 +235,7 @@ var _ = Describe("Ironic controller", func() {
 				"Ironic",
 				ironicNames.Namespace,
 				ironicNames.IronicDatabaseName.Name,
-				"Ironic",
+				"openstack.org/ironic",
 				mariadb,
 				timeout,
 				interval,

diff --git a/tests/functional/ironicapi_controller_test.go b/tests/functional/ironicapi_controller_test.go
@@ -93,7 +93,7 @@ var _ = Describe("IronicAPI controller", func() {
 		It("should have a finalizer", func() {
 			Eventually(func() []string {
 				return GetIronicAPI(ironicNames.APIName).Finalizers
-			}, timeout, interval).Should(ContainElement("IronicAPI"))
+			}, timeout, interval).Should(ContainElement("openstack.org/ironicapi"))
 		})
 		It("creates service account, role and rolebindig", func() {
 			th.ExpectCondition(

diff --git a/tests/functional/ironicconductor_controller_test.go b/tests/functional/ironicconductor_controller_test.go
@@ -95,7 +95,7 @@ var _ = Describe("IronicConductor controller", func() {
 		It("should have a finalizer", func() {
 			Eventually(func() []string {
 				return GetIronicConductor(ironicNames.ConductorName).Finalizers
-			}, timeout, interval).Should(ContainElement("IronicConductor"))
+			}, timeout, interval).Should(ContainElement("openstack.org/ironicconductor"))
 		})
 		It("creates service account, role and rolebindig", func() {
 			th.ExpectCondition(

diff --git a/tests/functional/ironicinspector_controller_test.go b/tests/functional/ironicinspector_controller_test.go
@@ -76,7 +76,7 @@ var _ = Describe("IronicInspector controller", func() {
 		It("should have a finalizer", func() {
 			Eventually(func() []string {
 				return GetIronicInspector(ironicNames.InspectorName).Finalizers
-			}, timeout, interval).Should(ContainElement("IronicInspector"))
+			}, timeout, interval).Should(ContainElement("openstack.org/ironicinspector"))
 		})
 		It("creates service account, role and rolebindig", func() {
 			th.ExpectCondition(
@@ -511,7 +511,7 @@ var _ = Describe("IronicInspector controller", func() {
 				"IronicInspector",
 				ironicNames.Namespace,
 				ironicNames.InspectorDatabaseName.Name,
-				"IronicInspector",
+				"openstack.org/ironicinspector",
 				mariadb,
 				timeout,
 				interval,

diff --git a/tests/kuttl/common/errors-cleanup-ironic.yaml b/tests/kuttl/common/errors-cleanup-ironic.yaml
@@ -10,7 +10,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicAPI
 metadata:
   finalizers:
-  - IronicAPI
+  - openstack.org/ironicapi
   name: ironic
 ---
 apiVersion: apps/v1

diff --git a/tests/kuttl/tests/deploy/10-assert-deploy-ironic.yaml b/tests/kuttl/tests/deploy/10-assert-deploy-ironic.yaml
@@ -12,7 +12,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: Ironic
 metadata:
   finalizers:
-  - Ironic
+  - openstack.org/ironic
   name: ironic
 spec:
   customServiceConfig: |
@@ -55,7 +55,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicAPI
 metadata:
   finalizers:
-  - IronicAPI
+  - openstack.org/ironicapi
   name: ironic-api
   ownerReferences:
   - apiVersion: ironic.openstack.org/v1beta1
@@ -82,7 +82,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicConductor
 metadata:
   finalizers:
-  - IronicConductor
+  - openstack.org/ironicconductor
   name: ironic-conductor
   ownerReferences:
   - apiVersion: ironic.openstack.org/v1beta1
@@ -111,7 +111,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicInspector
 metadata:
   finalizers:
-  - IronicInspector
+  - openstack.org/ironicinspector
   name: ironic-inspector
   ownerReferences:
   - apiVersion: ironic.openstack.org/v1beta1
@@ -141,7 +141,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicNeutronAgent
 metadata:
   finalizers:
-  - IronicNeutronAgent
+  - openstack.org/ironicneutronagent
   name: ironic-ironic-neutron-agent
   ownerReferences:
   - apiVersion: ironic.openstack.org/v1beta1

diff --git a/tests/kuttl/tests/standalone/10-assert-deploy-ironic-standalone.yaml b/tests/kuttl/tests/standalone/10-assert-deploy-ironic-standalone.yaml
@@ -11,7 +11,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: Ironic
 metadata:
   finalizers:
-  - Ironic
+  - openstack.org/ironic
   name: ironic
 spec:
   customServiceConfig: |
@@ -50,7 +50,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicAPI
 metadata:
   finalizers:
-  - IronicAPI
+  - openstack.org/ironicapi
   name: ironic-api
   ownerReferences:
   - apiVersion: ironic.openstack.org/v1beta1
@@ -77,7 +77,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicConductor
 metadata:
   finalizers:
-  - IronicConductor
+  - openstack.org/ironicconductor
   name: ironic-conductor
   ownerReferences:
   - apiVersion: ironic.openstack.org/v1beta1
@@ -106,7 +106,7 @@ apiVersion: ironic.openstack.org/v1beta1
 kind: IronicInspector
 metadata:
   finalizers:
-  - IronicInspector
+  - openstack.org/ironicinspector
   name: ironic-inspector
   ownerReferences:
   - apiVersion: ironic.openstack.org/v1beta1