Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update finalzier to CRD doc #794

Merged
merged 1 commit into from
Jun 19, 2024
Merged

update finalzier to CRD doc #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/google/go-cmp v0.6.0
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/robfig/cron/v3 v3.0.1
k8s.io/api v0.28.11
k8s.io/apimachinery v0.28.11
Expand Down
4 changes: 2 additions & 2 deletions api/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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=
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ require (
github.com/onsi/gomega v1.33.1
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa
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.20240617061457-85af496b1f8d
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240618160206-098a347e0f61
github.com/openstack-k8s-operators/nova-operator/api v0.0.0-20221209164002-f9e6b9363961
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9
github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76/go.mod h1:q1RrcH2Gr+4v/hc7GrRasvXC1fBnM3+QS8G46oSYdnE=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa h1:Zq8sd+K35D7jawVJzuEATsOTESdMT1Wu6t9gdGK8sdA=
github.com/openstack-k8s-operators/keystone-operator/api v0.3.1-0.20240617061212-21a80bc3d1fa/go.mod h1:0IMSIVB7kMArAHQW+fQcaWTN4xDURGaEyLT+ro2Q05k=
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.20240617061457-85af496b1f8d h1:9x6/YC/UzmT2dQ1ulHSFlK09cGQf3rxo0Ff5ki62/KE=
github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240617061457-85af496b1f8d/go.mod h1:C9Y3qa7mcFdqcWLpfnB61ZxI56Lu1PWm90er8tdAyu8=
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=
Expand Down
24 changes: 12 additions & 12 deletions test/functional/nova_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,37 +846,37 @@ var _ = Describe("Nova controller", func() {
)

service := keystone.GetKeystoneService(novaNames.KeystoneServiceName)
Expect(service.Finalizers).To(ContainElement("Nova"))
Expect(service.Finalizers).To(ContainElement("openstack.org/nova"))

th.DeleteInstance(GetNova(novaNames.NovaName))
service = keystone.GetKeystoneService(novaNames.KeystoneServiceName)
Expect(service.Finalizers).NotTo(ContainElement("Nova"))
Expect(service.Finalizers).NotTo(ContainElement("openstack.org/nova"))
})

It("removes the finalizers from the nova dbs", func() {
keystone.SimulateKeystoneServiceReady(novaNames.KeystoneServiceName)

apiDB := mariadb.GetMariaDBDatabase(novaNames.APIMariaDBDatabaseName)
Expect(apiDB.Finalizers).To(ContainElement("Nova"))
Expect(apiDB.Finalizers).To(ContainElement("openstack.org/nova"))
cell0DB := mariadb.GetMariaDBDatabase(cell0.MariaDBDatabaseName)
Expect(cell0DB.Finalizers).To(ContainElement("Nova"))
Expect(cell0DB.Finalizers).To(ContainElement("openstack.org/nova"))

apiAcc := mariadb.GetMariaDBAccount(novaNames.APIMariaDBDatabaseAccount)
Expect(apiAcc.Finalizers).To(ContainElement("Nova"))
Expect(apiAcc.Finalizers).To(ContainElement("openstack.org/nova"))
cell0Acc := mariadb.GetMariaDBAccount(cell0.MariaDBAccountName)
Expect(cell0Acc.Finalizers).To(ContainElement("Nova"))
Expect(cell0Acc.Finalizers).To(ContainElement("openstack.org/nova"))

th.DeleteInstance(GetNova(novaNames.NovaName))

apiDB = mariadb.GetMariaDBDatabase(novaNames.APIMariaDBDatabaseName)
Expect(apiDB.Finalizers).NotTo(ContainElement("Nova"))
Expect(apiDB.Finalizers).NotTo(ContainElement("openstack.org/nova"))
cell0DB = mariadb.GetMariaDBDatabase(cell0.MariaDBDatabaseName)
Expect(cell0DB.Finalizers).NotTo(ContainElement("Nova"))
Expect(cell0DB.Finalizers).NotTo(ContainElement("openstack.org/nova"))

apiAcc = mariadb.GetMariaDBAccount(novaNames.APIMariaDBDatabaseAccount)
Expect(apiAcc.Finalizers).NotTo(ContainElement("Nova"))
Expect(apiAcc.Finalizers).NotTo(ContainElement("openstack.org/nova"))
cell0Acc = mariadb.GetMariaDBAccount(cell0.MariaDBAccountName)
Expect(cell0Acc.Finalizers).NotTo(ContainElement("Nova"))
Expect(cell0Acc.Finalizers).NotTo(ContainElement("openstack.org/nova"))

})
})
Expand Down Expand Up @@ -1060,7 +1060,7 @@ var _ = Describe("Nova controller", func() {
"Nova API",
novaNames.Namespace,
novaNames.APIMariaDBDatabaseName.Name,
"Nova",
"openstack.org/nova",
mariadb,
timeout,
interval,
Expand Down Expand Up @@ -1168,7 +1168,7 @@ var _ = Describe("Nova controller", func() {
"Nova Cell",
novaNames.Namespace,
cell0.MariaDBDatabaseName.Name,
"Nova",
"openstack.org/nova",
mariadb,
timeout,
interval,
Expand Down
4 changes: 2 additions & 2 deletions test/functional/nova_metadata_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,12 +831,12 @@ var _ = Describe("NovaMetadata controller", func() {
corev1.ConditionTrue,
)
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
Expect(memcached.Finalizers).To(ContainElement("NovaMetadata"))
Expect(memcached.Finalizers).To(ContainElement("openstack.org/novametadata"))

Eventually(func(g Gomega) {
th.DeleteInstance(GetNovaMetadata(novaNames.MetadataName))
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
g.Expect(memcached.Finalizers).NotTo(ContainElement("NovaMetadata"))
g.Expect(memcached.Finalizers).NotTo(ContainElement("openstack.org/novametadata"))
}, timeout, interval).Should(Succeed())
})
})
Expand Down
4 changes: 2 additions & 2 deletions test/functional/nova_novncproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,12 +731,12 @@ var _ = Describe("NovaNoVNCProxy controller", func() {
corev1.ConditionTrue,
)
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
Expect(memcached.Finalizers).To(ContainElement("NovaNoVNCProxy"))
Expect(memcached.Finalizers).To(ContainElement("openstack.org/novanovncproxy"))

Eventually(func(g Gomega) {
th.DeleteInstance(GetNovaNoVNCProxy(cell1.NoVNCProxyStatefulSetName))
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
g.Expect(memcached.Finalizers).NotTo(ContainElement("NovaNoVNCProxy"))
g.Expect(memcached.Finalizers).NotTo(ContainElement("openstack.org/novanovncproxy"))
}, timeout, interval).Should(Succeed())
})
})
Expand Down
4 changes: 2 additions & 2 deletions test/functional/nova_scheduler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,12 @@ var _ = Describe("NovaScheduler controller", func() {
corev1.ConditionTrue,
)
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
Expect(memcached.Finalizers).To(ContainElement("NovaScheduler"))
Expect(memcached.Finalizers).To(ContainElement("openstack.org/novascheduler"))

Eventually(func(g Gomega) {
th.DeleteInstance(GetNovaScheduler(novaNames.SchedulerName))
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
g.Expect(memcached.Finalizers).NotTo(ContainElement("NovaScheduler"))
g.Expect(memcached.Finalizers).NotTo(ContainElement("openstack.org/novascheduler"))
}, timeout, interval).Should(Succeed())
})
})
Expand Down
8 changes: 4 additions & 4 deletions test/functional/novaapi_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,15 +402,15 @@ var _ = Describe("NovaAPI controller", func() {
)

endpoint := keystone.GetKeystoneEndpoint(novaNames.APIKeystoneEndpointName)
Expect(endpoint.Finalizers).To(ContainElement("NovaAPI"))
Expect(endpoint.Finalizers).To(ContainElement("openstack.org/novaapi"))

memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
Expect(memcached.Finalizers).To(ContainElement("NovaAPI"))
Expect(memcached.Finalizers).To(ContainElement("openstack.org/novaapi"))
th.DeleteInstance(GetNovaAPI(novaNames.APIName))
endpoint = keystone.GetKeystoneEndpoint(novaNames.APIKeystoneEndpointName)
Expect(endpoint.Finalizers).NotTo(ContainElement("NovaAPI"))
Expect(endpoint.Finalizers).NotTo(ContainElement("openstack.org/novaapi"))
memcached = infra.GetMemcached(novaNames.MemcachedNamespace)
Expect(memcached.Finalizers).NotTo(ContainElement("NovaAPI"))
Expect(memcached.Finalizers).NotTo(ContainElement("openstack.org/novaapi"))
})
})
})
Expand Down
4 changes: 2 additions & 2 deletions test/functional/novaconductor_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,12 +833,12 @@ var _ = Describe("NovaConductor controller", func() {
corev1.ConditionTrue,
)
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
Expect(memcached.Finalizers).To(ContainElement("NovaConductor"))
Expect(memcached.Finalizers).To(ContainElement("openstack.org/novaconductor"))

Eventually(func(g Gomega) {
th.DeleteInstance(GetNovaConductor(cell0.ConductorName))
memcached := infra.GetMemcached(novaNames.MemcachedNamespace)
g.Expect(memcached.Finalizers).NotTo(ContainElement("NovaConductor"))
g.Expect(memcached.Finalizers).NotTo(ContainElement("openstack.org/novaconductor"))
}, timeout, interval).Should(Succeed())
})
})
Expand Down
2 changes: 1 addition & 1 deletion test/kuttl/test-suites/default/config-tests/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: Nova
metadata:
finalizers:
- Nova
- openstack.org/nova
name: nova-kuttl
namespace: nova-kuttl-default
status:
Expand Down
2 changes: 1 addition & 1 deletion test/kuttl/test-suites/default/scale-tests/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: Nova
metadata:
finalizers:
- Nova
- openstack.org/nova
name: nova-kuttl
namespace: nova-kuttl-default
spec:
Expand Down
4 changes: 2 additions & 2 deletions test/kuttl/test-suites/default/scale-tests/02-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: Nova
metadata:
finalizers:
- Nova
- openstack.org/nova
name: nova-kuttl
status:
apiServiceReadyCount: 3
Expand All @@ -12,7 +12,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: NovaAPI
metadata:
finalizers:
- NovaAPI
- openstack.org/novaapi
name: nova-kuttl-api
namespace: nova-kuttl-default
spec:
Expand Down
4 changes: 2 additions & 2 deletions test/kuttl/test-suites/default/scale-tests/03-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: Nova
metadata:
finalizers:
- Nova
- openstack.org/nova
name: nova-kuttl
status:
apiServiceReadyCount: 1
Expand All @@ -12,7 +12,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: NovaAPI
metadata:
finalizers:
- NovaAPI
- openstack.org/novaapi
name: nova-kuttl-api
namespace: nova-kuttl-default
spec:
Expand Down
4 changes: 2 additions & 2 deletions test/kuttl/test-suites/default/scale-tests/04-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: Nova
metadata:
finalizers:
- Nova
- openstack.org/nova
name: nova-kuttl
spec:
apiDatabaseInstance: openstack
Expand Down Expand Up @@ -53,7 +53,7 @@ apiVersion: nova.openstack.org/v1beta1
kind: NovaAPI
metadata:
finalizers:
- NovaAPI
- openstack.org/novaapi
name: nova-kuttl-api
namespace: nova-kuttl-default
spec:
Expand Down
Loading