diff --git a/api/go.mod b/api/go.mod index 385ee8fd..521e5cbc 100644 --- a/api/go.mod +++ b/api/go.mod @@ -3,7 +3,7 @@ module github.com/openstack-k8s-operators/neutron-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 6097f24e..4cc77675 100644 --- 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.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/mariadb-operator/api v0.3.1-0.20240613130956-7d997dc5d972 + github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61 github.com/openstack-k8s-operators/neutron-operator/api v0.0.0-00010101000000-000000000000 github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240614143745-cbe8d2bba3e4 go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index ed9095fc..15d4748d 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/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240614143745-cbe8d2bba3e4 h1:ytwZ/esu8n/azfG6U8BFQalZyf1nzPswlhklXm0RWJE= github.com/openstack-k8s-operators/ovn-operator/api v0.3.1-0.20240614143745-cbe8d2bba3e4/go.mod h1:T+Jgh4Ng9nUZ6PF8McglFkPjRgdAO23igwlTY5r8VKU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/test/functional/neutronapi_controller_test.go b/test/functional/neutronapi_controller_test.go index c597315f..c5200af6 100644 --- a/test/functional/neutronapi_controller_test.go +++ b/test/functional/neutronapi_controller_test.go @@ -144,7 +144,7 @@ var _ = Describe("NeutronAPI controller", func() { // it to run Eventually(func() []string { return GetNeutronAPI(neutronAPIName).Finalizers - }, timeout, interval).Should(ContainElement("NeutronAPI")) + }, timeout, interval).Should(ContainElement("openstack.org/neutronapi")) }) It("should not create a secret", func() { @@ -1271,7 +1271,7 @@ var _ = Describe("NeutronAPI controller", func() { "Neutron API", neutronAPIName.Namespace, neutronapi.Database, - "NeutronAPI", + "openstack.org/neutronapi", mariadb, timeout, interval, diff --git a/test/kuttl/common/assert_sample_deployment.yaml b/test/kuttl/common/assert_sample_deployment.yaml index 56cfdb4b..d4ba06da 100644 --- a/test/kuttl/common/assert_sample_deployment.yaml +++ b/test/kuttl/common/assert_sample_deployment.yaml @@ -10,7 +10,7 @@ apiVersion: neutron.openstack.org/v1beta1 kind: NeutronAPI metadata: finalizers: - - NeutronAPI + - openstack.org/neutronapi name: neutron spec: customServiceConfig: | diff --git a/test/kuttl/common/errors_cleanup_neutron.yaml b/test/kuttl/common/errors_cleanup_neutron.yaml index 850587a5..cfa81f7f 100644 --- a/test/kuttl/common/errors_cleanup_neutron.yaml +++ b/test/kuttl/common/errors_cleanup_neutron.yaml @@ -10,7 +10,7 @@ apiVersion: neutron.openstack.org/v1beta1 kind: NeutronAPI metadata: finalizers: - - NeutronAPI + - openstack.org/neutronapi name: neutron --- apiVersion: apps/v1 diff --git a/test/kuttl/tests/neutron_scale/02-assert.yaml b/test/kuttl/tests/neutron_scale/02-assert.yaml index 92189a94..35e01f25 100644 --- a/test/kuttl/tests/neutron_scale/02-assert.yaml +++ b/test/kuttl/tests/neutron_scale/02-assert.yaml @@ -9,7 +9,7 @@ apiVersion: neutron.openstack.org/v1beta1 kind: NeutronAPI metadata: finalizers: - - NeutronAPI + - openstack.org/neutronapi name: neutron spec: replicas: 3 diff --git a/test/kuttl/tests/neutron_scale/03-assert.yaml b/test/kuttl/tests/neutron_scale/03-assert.yaml index 0fec1208..7ed5ab00 100644 --- a/test/kuttl/tests/neutron_scale/03-assert.yaml +++ b/test/kuttl/tests/neutron_scale/03-assert.yaml @@ -9,7 +9,7 @@ apiVersion: neutron.openstack.org/v1beta1 kind: NeutronAPI metadata: finalizers: - - NeutronAPI + - openstack.org/neutronapi name: neutron spec: replicas: 1 diff --git a/test/kuttl/tests/neutron_scale/04-assert.yaml b/test/kuttl/tests/neutron_scale/04-assert.yaml index 0e89b5b0..fbb13844 100644 --- a/test/kuttl/tests/neutron_scale/04-assert.yaml +++ b/test/kuttl/tests/neutron_scale/04-assert.yaml @@ -9,7 +9,7 @@ apiVersion: neutron.openstack.org/v1beta1 kind: NeutronAPI metadata: finalizers: - - NeutronAPI + - openstack.org/neutronapi name: neutron spec: replicas: 0