Propagate DB purge parameters to conductor

Implements: OSPRH-104
openstack-k8s-operators · Feb 25, 2024 · 582713e · 582713e
1 parent 159d3e3
commit 582713e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/api/v1beta1/novaconductor_types.go b/api/v1beta1/novaconductor_types.go
@@ -201,6 +201,7 @@ func NewNovaConductorSpec(
 		ServiceAccount:       novaCell.ServiceAccount,
 		TLS:                  novaCell.TLS,
 		PreserveJobs:         novaCell.PreserveJobs,
+		DBPurge:              novaCell.DBPurge,
 	}
 	return conductorSpec
 }

diff --git a/controllers/nova_controller.go b/controllers/nova_controller.go
@@ -853,6 +853,7 @@ func (r *NovaReconciler) ensureCell(
 		// and the conductor in the cell always the same as the NovaAPI
 		TLS:          instance.Spec.APIServiceTemplate.TLS.Ca,
 		PreserveJobs: instance.Spec.PreserveJobs,
+		DBPurge:      cellTemplate.DBPurge,
 	}
 	if cellTemplate.HasAPIAccess {
 		cellSpec.APIDatabaseHostname = apiDB.GetDatabaseHostname()

diff --git a/test/functional/base_test.go b/test/functional/base_test.go
@@ -338,6 +338,9 @@ func CreateNovaWithCell0(name types.NamespacedName) client.Object {
 				"cell0": map[string]interface{}{
 					"cellDatabaseUser": "nova_cell0",
 					"hasAPIAccess":     true,
+					"dbPurge": map[string]interface{}{
+						"schedule": "1 0 * * *",
+					},
 				},
 			},
 			"apiMessageBusInstance": cell0.TransportURLName.Name,

diff --git a/test/functional/nova_controller_test.go b/test/functional/nova_controller_test.go
@@ -139,7 +139,7 @@ var _ = Describe("Nova controller", func() {
 		It("defaults Spec fields", func() {
 			nova := GetNova(novaNames.NovaName)
 			cell0Template := nova.Spec.CellTemplates["cell0"]
-			Expect(cell0Template.DBPurge.Schedule).To(Equal(ptr.To("0 0 * * *")))
+			Expect(cell0Template.DBPurge.Schedule).To(Equal(ptr.To("1 0 * * *")))
 			Expect(cell0Template.DBPurge.ArchiveAge).To(Equal(ptr.To(30)))
 			Expect(cell0Template.DBPurge.PurgeAge).To(Equal(ptr.To(90)))
 		})
@@ -232,14 +232,14 @@ var _ = Describe("Nova controller", func() {
 			cell := GetNovaCell(cell0.CellCRName)
 			Expect(cell.Spec.ServiceUser).To(Equal("nova"))
 			Expect(cell.Spec.ServiceAccount).To(Equal(novaNames.ServiceAccountName.Name))
-			Expect(cell.Spec.DBPurge.Schedule).To(Equal(ptr.To("0 0 * * *")))
+			Expect(cell.Spec.DBPurge.Schedule).To(Equal(ptr.To("1 0 * * *")))
 			Expect(cell.Spec.DBPurge.ArchiveAge).To(Equal(ptr.To(30)))
 			Expect(cell.Spec.DBPurge.PurgeAge).To(Equal(ptr.To(90)))
 
 			conductor := GetNovaConductor(cell0.ConductorName)
 			Expect(conductor.Spec.ServiceUser).To(Equal("nova"))
 			Expect(conductor.Spec.ServiceAccount).To(Equal(novaNames.ServiceAccountName.Name))
-			Expect(conductor.Spec.DBPurge.Schedule).To(Equal(ptr.To("0 0 * * *")))
+			Expect(conductor.Spec.DBPurge.Schedule).To(Equal(ptr.To("1 0 * * *")))
 			Expect(conductor.Spec.DBPurge.ArchiveAge).To(Equal(ptr.To(30)))
 			Expect(conductor.Spec.DBPurge.PurgeAge).To(Equal(ptr.To(90)))