Improve handling of filesystem permissions and other fixes

1 files changed, 7 insertions, 10 deletions

diff --git a/setup/projects/adei/templates/60-adei.yml.j2 b/setup/projects/adei/templates/60-adei.yml.j2
index 537368f..ca3c17a 100644
--- a/setup/projects/adei/templates/60-adei.yml.j2
+++ b/setup/projects/adei/templates/60-adei.yml.j2
@@ -95,6 +95,8 @@ objects:
         adei-type: "{{ pod_type }}"
         adei-name: "{{ name }}"
         adei-setup: "${setup}"
+      annotations:
+        kaas/replicas: "{{ cfg.replicas }}"
     spec:
             replicas: "{{ cfg.replicas }}"
             revisionHistoryLimit: "{{ adei_pod_history_limit }}"
@@ -127,20 +129,15 @@ objects:
 {%       if (cfg.groups is defined) or (cfg.run_as is defined) %}
                 securityContext:
 {%         if (cfg.run_as is defined) %}
-{%            if (kaas_project_config.uids | default(kaas_openshift_uids))[cfg.run_as] is defined %}
-                  - {{ (kaas_project_config.uids | default(kaas_openshift_uids))[cfg.run_as].id }}
-{%            else %}
-                  - {{ cfg.run_as }}
-{%            endif %}
+                  runAsUser: {{ (kaas_project_uids[cfg.run_as] is defined) | ternary(kaas_project_uids[cfg.run_as].id, cfg.run_as) }}
 {%         endif %}
 {%       if (cfg.groups is defined) %}
+{%         if (ands_openshift_gid_mode | default('')) == "RunAsAny" %}
+                  fsGroup: {{ (kaas_project_gids[cfg.groups[0]] is defined) | ternary(kaas_project_gids[cfg.groups[0]].id, cfg.groups[0]) }}
+{%         endif %}
                   supplementalGroups:
 {%           for group in cfg.groups %}
-{%             if (kaas_project_config.gids | default(kaas_openshift_gids))[group] is defined %}
-                    - {{ (kaas_project_config.gids | default(kaas_openshift_gids))[group].id }}
-{%             else %}
-                    - {{ group }}
-{%             endif %}
+                    - {{ (kaas_project_gids[group] is defined) | ternary(kaas_project_gids[group].id, group) }}
 {%           endfor %}
 {%         endif %}
 {%       endif %}