From f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Sun, 11 Mar 2018 19:56:38 +0100
Subject: Various fixes before moving to hardware installation

---
 setup/projects/adei/templates/60-adei.yml.j2 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'setup/projects/adei/templates')

diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2
index ca3c17a..22f4bb0 100644
--- a/setup/projects/adei/templates/60-adei.yml.j2
+++ b/setup/projects/adei/templates/60-adei.yml.j2
@@ -75,12 +75,13 @@ objects:
     spec:
       schedule: "{{ cfg.cron }}"
       concurrencyPolicy: "Forbid"
+      startingDeadlineSeconds: "{{ cfg.start_tolerance | default(30) }}"
       successfulJobsHistoryLimit: "{{ adei_pod_history_limit }}"
       failedJobsHistoryLimit: "{{ adei_pod_history_limit }}"
       jobTemplate:
         spec:
             completions: "1"
-            activeDeadlineSeconds: "3600"
+            activeDeadlineSeconds: "{{ cfg.max_run_time | default(600) }}"
 #            restartPolicy: "Never"
             template:
               metadata:
@@ -125,6 +126,9 @@ objects:
                   adei-setup: "${setup}"
               spec:
                 restartPolicy: {{ restart_policy }}
+{%       if (ands_default_node_selector is defined) and (ands_default_node_selector | length > 0) %}
+                nodeSelector: {{ ands_default_node_selector | to_json }}
+{%       endif %}
                 volumes: {{ cfg.vols | to_json }}
 {%       if (cfg.groups is defined) or (cfg.run_as is defined) %}
                 securityContext:
-- 
cgit v1.2.3