Skip to content

Commit a9dcbb2

Browse files
committed
Add Toleration and NodeSelector to all controllers
added defenitions for tolerations and nodeSelector to all controllers
1 parent f290639 commit a9dcbb2

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

controllers/ansibletest_controller.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,16 @@ func (r *AnsibleTestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
261261
return ctrl.Result{}, err
262262
}
263263

264+
if externalWorkflowCounter < len(instance.Spec.Workflow) {
265+
if instance.Spec.Workflow[externalWorkflowCounter].NodeSelector != nil {
266+
instance.Spec.NodeSelector = *instance.Spec.Workflow[externalWorkflowCounter].NodeSelector
267+
}
268+
269+
if instance.Spec.Workflow[externalWorkflowCounter].Tolerations != nil {
270+
instance.Spec.Tolerations = *instance.Spec.Workflow[externalWorkflowCounter].Tolerations
271+
}
272+
}
273+
264274
jobDef := ansibletest.Job(
265275
instance,
266276
serviceLabels,

pkg/ansibletest/job.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ func Job(
5454
RunAsGroup: &runAsGroup,
5555
FSGroup: &runAsGroup,
5656
},
57+
Tolerations: instance.Spec.Tolerations,
58+
NodeSelector: instance.Spec.NodeSelector,
5759
Containers: []corev1.Container{
5860
{
5961
Name: instance.Name,

pkg/horizontest/job.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ func Job(
5353
RunAsGroup: &runAsGroup,
5454
FSGroup: &runAsGroup,
5555
},
56+
Tolerations: instance.Spec.Tolerations,
57+
NodeSelector: instance.Spec.NodeSelector,
5658
Containers: []corev1.Container{
5759
{
5860
Name: instance.Name,

0 commit comments

Comments
 (0)