summaryrefslogtreecommitdiffstats
path: root/setup/projects
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-03-11 19:56:38 +0100
committerSuren A. Chilingaryan <csa@suren.me>2018-03-11 19:56:38 +0100
commitf3c41dd13a0a86382b80d564e9de0d6b06fb1dbf (patch)
tree3522ce77203da92bb2b6f7cfa2b0999bf6cc132c /setup/projects
parent6bc3a3ac71e11fb6459df715536fec373c123a97 (diff)
downloadands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.tar.gz
ands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.tar.bz2
ands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.tar.xz
ands-f3c41dd13a0a86382b80d564e9de0d6b06fb1dbf.zip
Various fixes before moving to hardware installation
Diffstat (limited to 'setup/projects')
-rw-r--r--setup/projects/adei/templates/60-adei.yml.j26
-rw-r--r--setup/projects/adei/vars/globals.yml4
-rw-r--r--setup/projects/adei/vars/pods.yml3
-rw-r--r--setup/projects/kaas/vars/pods.yml3
4 files changed, 11 insertions, 5 deletions
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:
diff --git a/setup/projects/adei/vars/globals.yml b/setup/projects/adei/vars/globals.yml
index f8d7816..01fb495 100644
--- a/setup/projects/adei/vars/globals.yml
+++ b/setup/projects/adei/vars/globals.yml
@@ -233,3 +233,7 @@ adei_frontends:
mounts: "{{ adei_prod_mounts | union(adei_pod_mounts) }}"
groups: [ "adei" ]
enabled: true
+
+# Extra options:
+# start_tolerance: 30
+# max_run_time: 600
diff --git a/setup/projects/adei/vars/pods.yml b/setup/projects/adei/vars/pods.yml
index 182db9c..3923c23 100644
--- a/setup/projects/adei/vars/pods.yml
+++ b/setup/projects/adei/vars/pods.yml
@@ -1,8 +1,7 @@
pods:
mysql:
service: { ports: [ 3306 ] }
- sched: { replicas: 1, strategy: "Recreate", selector: { master: 1 } }
- selector: { master: 1 }
+ sched: { replicas: 1, strategy: "Recreate", restrict: { fat_storage: "1" } }
groups: [ "adei_db" ]
images:
- image: "centos/mysql-57-centos7"
diff --git a/setup/projects/kaas/vars/pods.yml b/setup/projects/kaas/vars/pods.yml
index 41831ab..8cfa65a 100644
--- a/setup/projects/kaas/vars/pods.yml
+++ b/setup/projects/kaas/vars/pods.yml
@@ -1,8 +1,7 @@
pods:
kaas-router:
service: { host: "{{ katrin_node }}", ports: [ 80/8080, 443/8043 ] }
- sched: { replicas: 1, selector: { master: 1 } }
- selector: { master: 1 }
+ sched: { replicas: 1, restrict: { master: "1" } }
images:
- image: "httpd:2.2"
mappings: