summaryrefslogtreecommitdiffstats
path: root/roles/ands_kaas/templates/50-kaas-pods.yml.j2
diff options
context:
space:
mode:
Diffstat (limited to 'roles/ands_kaas/templates/50-kaas-pods.yml.j2')
-rw-r--r--roles/ands_kaas/templates/50-kaas-pods.yml.j214
1 files changed, 7 insertions, 7 deletions
diff --git a/roles/ands_kaas/templates/50-kaas-pods.yml.j2 b/roles/ands_kaas/templates/50-kaas-pods.yml.j2
index 9782f75..2ed7462 100644
--- a/roles/ands_kaas/templates/50-kaas-pods.yml.j2
+++ b/roles/ands_kaas/templates/50-kaas-pods.yml.j2
@@ -7,7 +7,7 @@ metadata:
annotations:
descriptions: {{ kaas_project_config.description | default(kaas_project ~ "auto-generated pod template") }}
objects:
-{% for name, pod in (kaas_project_config.pods | default(kaas_openshift_volumes)).iteritems() %}
+{% for name, pod in (kaas_project_config.pods | default({})).iteritems() %}
{% set pubkey = "kaas_" ~ name ~ "_pubkey" %}
{% set privkey = "kaas_" ~ name ~ "_privkey" %}
{% set cakey = "kaas_" ~ name ~ "_ca" %}
@@ -68,10 +68,10 @@ objects:
metadata:
name: {{ pod.name | default(name) }}
spec:
- replicas: {{ pod.sched.replicas | default(1) }}
+ replicas: {{ ( pod.sched | default({})).replicas | default(1) }}
revisionHistoryLimit: 2
strategy:
- type: {{ pod.sched.strategy | default('Rolling') }}
+ type: {{ (pod.sched | default({})).strategy | default('Rolling') }}
triggers:
- type: ConfigChange
selector:
@@ -105,18 +105,18 @@ objects:
securityContext:
{% if (pod.run_as is defined) %}
{% if (kaas_project_config.uids | default(kaas_openshift_uids))[pod.run_as] is defined %}
- - {{ (kaas_project_config.uids | default(kaas_openshift_uids))[pod.run_as].id }}
+ runAsUser: {{ (kaas_project_config.uids | default(kaas_openshift_uids))[pod.run_as].id }}
{% else %}
- - {{ pod.run_as }}
+ runAsUser: {{ pod.run_as }}
{% endif %}
{% endif %}
{% if (pod.groups is defined) %}
supplementalGroups:
{% for group in pod.groups %}
{% if (kaas_project_config.gids | default(kaas_openshift_gids))[group] is defined %}
- - {{ (kaas_project_config.gids | default(kaas_openshift_gids))[group].id }}
+ - {{ (kaas_project_config.gids | default(kaas_openshift_gids))[group].id }}
{% else %}
- - {{ group }}
+ - {{ group }}
{% endif %}
{% endfor %}
{% endif %}