Merge pull request #1495 from zimnx/mz/placement-in-cleanup-job-1.11

[v1.11] Set ScyllaCluster placement requirements on cleanup Jobs
scylladb · Oct 19, 2023 · daa64e7 · daa64e7
2 parents 458f9bb + 4fe4e28
commit daa64e7
Show file tree

Hide file tree

Showing 2 changed files with 389 additions and 0 deletions.
diff --git a/pkg/controller/scyllacluster/resource.go b/pkg/controller/scyllacluster/resource.go
@@ -1053,6 +1053,17 @@ func MakeJobs(sc *scyllav1.ScyllaCluster, services map[string]*corev1.Service, i
 				naming.CleanupJobTokenRingHashAnnotation: currentTokenRingHash,
 			}
 
+			var tolerations []corev1.Toleration
+			var affinity *corev1.Affinity
+			if rack.Placement != nil {
+				tolerations = rack.Placement.Tolerations
+				affinity = &corev1.Affinity{
+					NodeAffinity:    rack.Placement.NodeAffinity,
+					PodAffinity:     rack.Placement.PodAffinity,
+					PodAntiAffinity: rack.Placement.PodAntiAffinity,
+				}
+			}
+
 			jobs = append(jobs, &batchv1.Job{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      naming.CleanupJobForService(svc.Name),
@@ -1070,6 +1081,8 @@ func MakeJobs(sc *scyllav1.ScyllaCluster, services map[string]*corev1.Service, i
 							Annotations: annotations,
 						},
 						Spec: corev1.PodSpec{
+							Tolerations:   tolerations,
+							Affinity:      affinity,
 							RestartPolicy: corev1.RestartPolicyOnFailure,
 							Containers: []corev1.Container{
 								{