From c2b1320e94c23bf940e6288bd03553e20b9fc9cc Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Tue, 18 Jun 2024 11:53:42 +0200 Subject: [PATCH] update finalzier to CRD doc Depends-On: https://github.com/openstack-k8s-operators/lib-common/pull/519 Signed-off-by: Martin Schuppert --- api/go.mod | 2 +- api/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- tests/functional/ovncontroller_controller_test.go | 2 +- tests/functional/ovndbcluster_controller_test.go | 2 +- tests/functional/ovnnorthd_controller_test.go | 2 +- tests/kuttl/common/assert_sample_deployment.yaml | 8 ++++---- tests/kuttl/common/errors_cleanup_ovn.yaml | 8 ++++---- tests/kuttl/tests/ovn_db_delete/02-assert.yaml | 4 ++-- tests/kuttl/tests/ovn_db_delete/08-assert.yaml | 4 ++-- tests/kuttl/tests/ovn_scale/02-assert.yaml | 2 +- tests/kuttl/tests/ovn_scale/03-assert.yaml | 2 +- tests/kuttl/tests/ovn_scale/04-assert.yaml | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/api/go.mod b/api/go.mod index 61ec043b..fa4d2c70 100644 --- a/api/go.mod +++ b/api/go.mod @@ -6,7 +6,7 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/uuid v1.6.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 sigs.k8s.io/controller-runtime v0.16.6 diff --git a/api/go.sum b/api/go.sum index ffdccbd8..9221b40f 100644 --- a/api/go.sum +++ b/api/go.sum @@ -78,8 +78,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 index 1648440c..dcaa191c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.19.0 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/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/ovn-operator/api v0.0.0-20230418071801-b5843d9e05fb go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index 3da8883d..c174b2d0 100644 --- a/go.sum +++ b/go.sum @@ -87,8 +87,8 @@ 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/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/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/tests/functional/ovncontroller_controller_test.go b/tests/functional/ovncontroller_controller_test.go index 5123a3d0..cf0d7d3d 100644 --- a/tests/functional/ovncontroller_controller_test.go +++ b/tests/functional/ovncontroller_controller_test.go @@ -62,7 +62,7 @@ var _ = Describe("OVNController controller", func() { // it to run Eventually(func() []string { return GetOVNController(OVNControllerName).Finalizers - }, timeout, interval).Should(ContainElement("OVNController")) + }, timeout, interval).Should(ContainElement("openstack.org/ovncontroller")) }) It("should create a ConfigMap for net_setup.sh with eth0 as Interface Name", func() { diff --git a/tests/functional/ovndbcluster_controller_test.go b/tests/functional/ovndbcluster_controller_test.go index 6e68df25..de0643a7 100644 --- a/tests/functional/ovndbcluster_controller_test.go +++ b/tests/functional/ovndbcluster_controller_test.go @@ -168,7 +168,7 @@ var _ = Describe("OVNDBCluster controller", func() { // it to run Eventually(func() []string { return GetOVNDBCluster(OVNDBClusterName).Finalizers - }, timeout, interval).Should(ContainElement("OVNDBCluster")) + }, timeout, interval).Should(ContainElement("openstack.org/ovndbcluster")) }) DescribeTable("should not create the config map", diff --git a/tests/functional/ovnnorthd_controller_test.go b/tests/functional/ovnnorthd_controller_test.go index 149ba6ba..41e07148 100644 --- a/tests/functional/ovnnorthd_controller_test.go +++ b/tests/functional/ovnnorthd_controller_test.go @@ -54,7 +54,7 @@ var _ = Describe("OVNNorthd controller", func() { // it to run Eventually(func() []string { return ovn.GetOVNNorthd(ovnNorthdName).Finalizers - }, timeout, interval).Should(ContainElement("OVNNorthd")) + }, timeout, interval).Should(ContainElement("openstack.org/ovnnorthd")) }) It("should be in input ready condition", func() { diff --git a/tests/kuttl/common/assert_sample_deployment.yaml b/tests/kuttl/common/assert_sample_deployment.yaml index f552b386..7b6ab795 100644 --- a/tests/kuttl/common/assert_sample_deployment.yaml +++ b/tests/kuttl/common/assert_sample_deployment.yaml @@ -22,7 +22,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNNorthd metadata: finalizers: - - OVNNorthd + - openstack.org/ovnnorthd name: ovnnorthd-sample spec: logLevel: info @@ -34,7 +34,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-nb-sample spec: dbType: NB @@ -48,7 +48,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-sb-sample spec: dbType: SB @@ -62,7 +62,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNController metadata: finalizers: - - OVNController + - openstack.org/ovncontroller name: ovncontroller-sample spec: external-ids: diff --git a/tests/kuttl/common/errors_cleanup_ovn.yaml b/tests/kuttl/common/errors_cleanup_ovn.yaml index 20794d3b..a324b744 100644 --- a/tests/kuttl/common/errors_cleanup_ovn.yaml +++ b/tests/kuttl/common/errors_cleanup_ovn.yaml @@ -14,28 +14,28 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNNorthd metadata: finalizers: - - OVNNorthd + - openstack.org/ovnnorthd name: ovnnorthd-sample --- apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-nb-sample --- apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-sb-sample --- apiVersion: ovn.openstack.org/v1beta1 kind: OVNController metadata: finalizers: - - OVNController + - openstack.org/ovncontroller name: ovncontroller-sample --- apiVersion: apps/v1 diff --git a/tests/kuttl/tests/ovn_db_delete/02-assert.yaml b/tests/kuttl/tests/ovn_db_delete/02-assert.yaml index 72c814ad..0dd7be77 100644 --- a/tests/kuttl/tests/ovn_db_delete/02-assert.yaml +++ b/tests/kuttl/tests/ovn_db_delete/02-assert.yaml @@ -9,7 +9,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-nb-sample spec: replicas: 3 @@ -29,7 +29,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-sb-sample spec: replicas: 3 diff --git a/tests/kuttl/tests/ovn_db_delete/08-assert.yaml b/tests/kuttl/tests/ovn_db_delete/08-assert.yaml index dfed497c..7506efde 100644 --- a/tests/kuttl/tests/ovn_db_delete/08-assert.yaml +++ b/tests/kuttl/tests/ovn_db_delete/08-assert.yaml @@ -10,7 +10,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-nb-sample spec: replicas: 1 @@ -30,7 +30,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNDBCluster metadata: finalizers: - - OVNDBCluster + - openstack.org/ovndbcluster name: ovndbcluster-sb-sample spec: replicas: 1 diff --git a/tests/kuttl/tests/ovn_scale/02-assert.yaml b/tests/kuttl/tests/ovn_scale/02-assert.yaml index 81e0a44c..13c6d81e 100644 --- a/tests/kuttl/tests/ovn_scale/02-assert.yaml +++ b/tests/kuttl/tests/ovn_scale/02-assert.yaml @@ -9,7 +9,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNNorthd metadata: finalizers: - - OVNNorthd + - openstack.org/ovnnorthd name: ovnnorthd-sample spec: replicas: 3 diff --git a/tests/kuttl/tests/ovn_scale/03-assert.yaml b/tests/kuttl/tests/ovn_scale/03-assert.yaml index cc287936..d8b1a349 100644 --- a/tests/kuttl/tests/ovn_scale/03-assert.yaml +++ b/tests/kuttl/tests/ovn_scale/03-assert.yaml @@ -9,7 +9,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNNorthd metadata: finalizers: - - OVNNorthd + - openstack.org/ovnnorthd name: ovnnorthd-sample spec: replicas: 1 diff --git a/tests/kuttl/tests/ovn_scale/04-assert.yaml b/tests/kuttl/tests/ovn_scale/04-assert.yaml index b647a177..f0644b74 100644 --- a/tests/kuttl/tests/ovn_scale/04-assert.yaml +++ b/tests/kuttl/tests/ovn_scale/04-assert.yaml @@ -9,7 +9,7 @@ apiVersion: ovn.openstack.org/v1beta1 kind: OVNNorthd metadata: finalizers: - - OVNNorthd + - openstack.org/ovnnorthd name: ovnnorthd-sample spec: replicas: 0