Merge pull request #428 from stuggi/align_finalizer

update finalzier to CRD doc
openstack-k8s-operators · Jun 19, 2024 · b17a4c9 · b17a4c9
2 parents 21a80bc + 1237c64
commit b17a4c9
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 34 deletions.
diff --git a/api/go.mod b/api/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gophercloud/gophercloud v1.12.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
 	github.com/openstack-k8s-operators/lib-common/modules/openstack v0.3.1-0.20240615134235-24529fcff658
 	github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240615134235-24529fcff658
 	golang.org/x/exp v0.0.0-20240213143201-ec583247a57a

diff --git a/api/go.sum b/api/go.sum
@@ -73,8 +73,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/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=

diff --git a/go.mod b/go.mod
@@ -10,10 +10,10 @@ 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.20240213125925-e40975f3db7e
-	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/openstack 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/mariadb-operator/api v0.3.1-0.20240613130956-7d997dc5d972
+	github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61
 	go.uber.org/zap v1.27.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.28.11

diff --git a/go.sum b/go.sum
@@ -76,14 +76,14 @@ github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxC
 github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4=
 github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-996e41d1af19 h1:TUzcFb4Kweh3gMv1noPvWBIbqnPu2FlrWY6QgGZOdp4=
 github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-996e41d1af19/go.mod h1:7y2IQWFqkyCZb2CVfYzI0N9YRPUgEeGAgjxvOFvhRpo=
-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/keystoneapi_controller_test.go b/tests/functional/keystoneapi_controller_test.go
@@ -158,7 +158,7 @@ var _ = Describe("Keystone controller", func() {
 			// it to run
 			Eventually(func() []string {
 				return GetKeystoneAPI(keystoneAPIName).Finalizers
-			}, timeout, interval).Should(ContainElement("KeystoneAPI"))
+			}, timeout, interval).Should(ContainElement("openstack.org/keystoneapi"))
 		})
 	})
 
@@ -660,18 +660,18 @@ var _ = Describe("Keystone controller", func() {
 
 		It("removes the finalizers when deleted", func() {
 			keystone := GetKeystoneAPI(keystoneAPIName)
-			Expect(keystone.Finalizers).To(ContainElement("KeystoneAPI"))
+			Expect(keystone.Finalizers).To(ContainElement("openstack.org/keystoneapi"))
 			db := mariadb.GetMariaDBDatabase(keystoneAPIName)
-			Expect(db.Finalizers).To(ContainElement("KeystoneAPI"))
+			Expect(db.Finalizers).To(ContainElement("openstack.org/keystoneapi"))
 			dbAcc := mariadb.GetMariaDBAccount(keystoneAccountName)
-			Expect(dbAcc.Finalizers).To(ContainElement("KeystoneAPI"))
+			Expect(dbAcc.Finalizers).To(ContainElement("openstack.org/keystoneapi"))
 
 			th.DeleteInstance(GetKeystoneAPI(keystoneAPIName))
 
 			db = mariadb.GetMariaDBDatabase(keystoneAPIName)
-			Expect(db.Finalizers).NotTo(ContainElement("KeystoneAPI"))
+			Expect(db.Finalizers).NotTo(ContainElement("openstack.org/keystoneapi"))
 			dbAcc = mariadb.GetMariaDBAccount(keystoneAccountName)
-			Expect(dbAcc.Finalizers).NotTo(ContainElement("KeystoneAPI"))
+			Expect(dbAcc.Finalizers).NotTo(ContainElement("openstack.org/keystoneapi"))
 		})
 	})
 
@@ -1112,7 +1112,7 @@ var _ = Describe("Keystone controller", func() {
 				"Keystone",
 				keystoneAPIName.Namespace,
 				keystoneAPIName.Name,
-				"KeystoneAPI",
+				"openstack.org/keystoneapi",
 				mariadb,
 				timeout,
 				interval,

diff --git a/tests/kuttl/common/assert_sample_deployment.yaml b/tests/kuttl/common/assert_sample_deployment.yaml
@@ -10,7 +10,7 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
+  - openstack.org/keystoneapi
   name: keystone
 spec:
   adminProject: admin

diff --git a/tests/kuttl/common/errors_cleanup_keystone.yaml b/tests/kuttl/common/errors_cleanup_keystone.yaml
@@ -10,7 +10,7 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
+  - openstack.org/keystoneapi
   name: keystone
 ---
 apiVersion: apps/v1

diff --git a/tests/kuttl/tests/keystone_resources/01-assert.yaml b/tests/kuttl/tests/keystone_resources/01-assert.yaml
@@ -8,15 +8,15 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
-  - KeystoneService-placement
+  - openstack.org/keystoneapi
+  - openstack.org/keystoneservice-placement
   name: keystone
 ---
 apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneService
 metadata:
   finalizers:
-  - KeystoneService
+  - openstack.org/keystoneservice
   name: placement
 spec:
   enabled: true

diff --git a/tests/kuttl/tests/keystone_resources/02-assert.yaml b/tests/kuttl/tests/keystone_resources/02-assert.yaml
@@ -9,24 +9,24 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
-  - KeystoneService-placement
-  - KeystoneEndpoint-placement
+  - openstack.org/keystoneapi
+  - openstack.org/keystoneservice-placement
+  - openstack.org/keystoneendpoint-placement
   name: keystone
 ---
 apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneService
 metadata:
   finalizers:
-  - KeystoneService
-  - KeystoneEndpoint-placement
+  - openstack.org/keystoneservice
+  - openstack.org/keystoneendpoint-placement
   name: placement
 ---
 apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneEndpoint
 metadata:
   finalizers:
-  - KeystoneEndpoint
+  - openstack.org/keystoneendpoint
   name: placement
 spec:
   endpoints:

diff --git a/tests/kuttl/tests/keystone_resources/03-assert.yaml b/tests/kuttl/tests/keystone_resources/03-assert.yaml
@@ -8,13 +8,13 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
-  - KeystoneService-placement
+  - openstack.org/keystoneapi
+  - openstack.org/keystoneservice-placement
   name: keystone
 ---
 apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneService
 metadata:
   finalizers:
-  - KeystoneService
+  - openstack.org/keystoneservice
   name: placement
diff --git a/tests/kuttl/tests/keystone_resources/04-assert.yaml b/tests/kuttl/tests/keystone_resources/04-assert.yaml
@@ -7,5 +7,5 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
+  - openstack.org/keystoneapi
   name: keystone
diff --git a/tests/kuttl/tests/keystone_scale/01-assert.yaml b/tests/kuttl/tests/keystone_scale/01-assert.yaml
@@ -10,7 +10,7 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
+  - openstack.org/keystoneapi
   name: keystone
 spec:
   replicas: 3

diff --git a/tests/kuttl/tests/keystone_scale/02-assert.yaml b/tests/kuttl/tests/keystone_scale/02-assert.yaml
@@ -9,7 +9,7 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
+  - openstack.org/keystoneapi
   name: keystone
 spec:
   replicas: 1

diff --git a/tests/kuttl/tests/keystone_scale/03-assert.yaml b/tests/kuttl/tests/keystone_scale/03-assert.yaml
@@ -9,7 +9,7 @@ apiVersion: keystone.openstack.org/v1beta1
 kind: KeystoneAPI
 metadata:
   finalizers:
-  - KeystoneAPI
+  - openstack.org/keystoneapi
   name: keystone
 spec:
   adminProject: admin