Set nodeSelector on jobs/cronjobs

Author: olliewalsh

pkg/nova/celldelete.go

@@ -82,5 +82,9 @@ func CellDeleteJob(
 		},
 	}
 
+	if cell.Spec.NodeSelector != nil && len(*cell.Spec.NodeSelector) > 0 {
+		job.Spec.Template.Spec.NodeSelector = *cell.Spec.NodeSelector
+	}
+
 	return job
 }

pkg/nova/cellmapping.go

@@ -82,5 +82,9 @@ func CellMappingJob(
 		},
 	}
 
+	if cell.Spec.NodeSelector != nil && len(*cell.Spec.NodeSelector) > 0 {
+		job.Spec.Template.Spec.NodeSelector = *cell.Spec.NodeSelector
+	}
+
 	return job
 }

pkg/nova/host_discover.go

@@ -94,5 +94,9 @@ func HostDiscoveryJob(
 		},
 	}
 
+	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+		job.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
+	}
+
 	return job
 }

pkg/novaconductor/dbpurge.go

@@ -95,5 +95,9 @@ func DBPurgeCronJob(
 		},
 	}
 
+	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+		cron.Spec.JobTemplate.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
+	}
+
 	return cron
 }

pkg/novaconductor/dbsync.go

@@ -93,5 +93,10 @@ func CellDBSyncJob(
 			},
 		},
 	}
+
+	if instance.Spec.NodeSelector != nil && len(*instance.Spec.NodeSelector) > 0 {
+		job.Spec.Template.Spec.NodeSelector = *instance.Spec.NodeSelector
+	}
+
 	return job
 }

test/functional/nova_reconfiguration_test.go

@@ -333,14 +333,17 @@ var _ = Describe("Nova reconfiguration", func() {
 				nova.Spec.NodeSelector = &newSelector
 
 				g.Expect(k8sClient.Update(ctx, nova)).To(Succeed())
-				novaDeploymentName := serviceNameFunc()
-				th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
-				th.SimulateStatefulSetReplicaReady(novaDeploymentName)
 				SimulateReadyOfNovaTopServices()
+				th.SimulateJobSuccess(cell1.DBSyncJobName)
+				th.SimulateJobSuccess(cell2.DBSyncJobName)
 
-				serviceDeployment := th.GetStatefulSet(novaDeploymentName)
+				serviceDeployment := th.GetStatefulSet(serviceNameFunc())
 				g.Expect(serviceDeployment.Spec.Template.Spec.NodeSelector).To(Equal(newSelector))
 
+				g.Expect(th.GetJob(cell0.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(Equal(newSelector))
+				g.Expect(th.GetJob(cell1.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(Equal(newSelector))
+				g.Expect(th.GetJob(cell2.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(Equal(newSelector))
+
 			}, timeout, interval).Should(Succeed())
 
 			// Now reset it back to empty and see that it is propagates too
@@ -353,10 +356,17 @@ var _ = Describe("Nova reconfiguration", func() {
 				g.Expect(k8sClient.Update(ctx, nova)).To(Succeed())
 
 				serviceDeploymentName := serviceNameFunc()
+				th.SimulateJobSuccess(cell0.DBSyncJobName)
+				th.SimulateJobSuccess(cell1.DBSyncJobName)
+				th.SimulateJobSuccess(cell2.DBSyncJobName)
 				th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
 				th.SimulateStatefulSetReplicaReady(serviceDeploymentName)
 				serviceDeployment := th.GetStatefulSet(serviceDeploymentName)
 				g.Expect(serviceDeployment.Spec.Template.Spec.NodeSelector).To(BeNil())
+
+				g.Expect(th.GetJob(cell0.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(BeNil())
+				g.Expect(th.GetJob(cell1.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(BeNil())
+				g.Expect(th.GetJob(cell2.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(BeNil())
 			}, timeout, interval).Should(Succeed())
 		},
 			Entry("the nova api pods",
@@ -403,8 +413,11 @@ var _ = Describe("Nova reconfiguration", func() {
 
 				}
 				g.Expect(k8sClient.Update(ctx, nova)).To(Succeed())
+				th.SimulateJobSuccess(cell0.DBSyncJobName)
 				th.SimulateStatefulSetReplicaReady(cell0.ConductorStatefulSetName)
+				th.SimulateJobSuccess(cell1.DBSyncJobName)
 				th.SimulateStatefulSetReplicaReady(cell1.ConductorStatefulSetName)
+				th.SimulateJobSuccess(cell2.DBSyncJobName)
 				th.SimulateStatefulSetReplicaReady(cell2.ConductorStatefulSetName)
 
 				apiDeployment := th.GetStatefulSet(novaNames.APIStatefulSetName)
@@ -420,6 +433,10 @@ var _ = Describe("Nova reconfiguration", func() {
 				g.Expect(conductorDeployment.Spec.Template.Spec.NodeSelector).To(Equal(conductorSelector))
 				conductorDeployment = th.GetStatefulSet(cell2.ConductorStatefulSetName)
 				g.Expect(conductorDeployment.Spec.Template.Spec.NodeSelector).To(BeNil())
+
+				g.Expect(th.GetJob(cell0.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(Equal(conductorSelector))
+				g.Expect(th.GetJob(cell1.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(Equal(conductorSelector))
+				g.Expect(th.GetJob(cell2.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(BeNil())
 			}, timeout, interval).Should(Succeed())
 			SimulateReadyOfNovaTopServices()
 
@@ -446,6 +463,10 @@ var _ = Describe("Nova reconfiguration", func() {
 				g.Expect(conductorDeployment.Spec.Template.Spec.NodeSelector).To(Equal(conductorSelector))
 				conductorDeployment = th.GetStatefulSet(cell2.ConductorStatefulSetName)
 				g.Expect(conductorDeployment.Spec.Template.Spec.NodeSelector).To(BeNil())
+
+				g.Expect(th.GetJob(cell0.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(Equal(conductorSelector))
+				g.Expect(th.GetJob(cell1.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(Equal(conductorSelector))
+				g.Expect(th.GetJob(cell2.DBSyncJobName).Spec.Template.Spec.NodeSelector).To(BeNil())
 			}, timeout, interval).Should(Succeed())
 		})
 	})