Merge branch 'update-limitrange' into 'master'

Update CPU and memory limitrange See merge request ansible-roles/osbs-namespace!21
containerbuildsystem · Nov 2, 2020 · c1aa004 · c1aa004
2 parents cbf99f6 + 13a4756
commit c1aa004
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -11,6 +11,7 @@ osbs_is_admin: true
 osbs_service_accounts: []
 
 osbs_cpu_limitrange: ''
+osbs_memory_limitrange: ''
 
 osbs_admin_groups: []
 osbs_admin_users: []

diff --git a/templates/openshift-limitrange.yml.j2 b/templates/openshift-limitrange.yml.j2
@@ -8,3 +8,6 @@ spec:
   - type: Container
     defaultRequest:
       cpu: {{ osbs_cpu_limitrange }}
+      {% if osbs_memory_limitrange %}
+      memory: {{ osbs_memory_limitrange }}
+      {% endif %}