From f9507a0a2d46d7ee08b9b8de242d7d9789a37154 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 6 Feb 2019 17:25:01 +0100
Subject: [PATCH] Implement resource limits for Koschei

---
 playbooks/openshift-apps/koschei.yml            | 17 ++++++++---------
 .../koschei/templates/backend-deployment.yml    |  6 +++++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index d46902d859..1c873873fd 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -43,16 +43,15 @@
         template: backend-deployment.yml
         objectname: "{{ item.name }}-deployment.yml"
         service: "{{ item.name }}"
-        memory: "{{ item.memory }}"
+        min_cpu: "{{ item.cpu[0] }}"
+        max_cpu: "{{ item.cpu[1] }}"
+        min_mem: "{{ item.memory[0] }}"
+        max_mem: "{{ item.memory[1] }}"
       with_items:
-        - name: polling
-          memory: 512
-        - name: scheduler
-          memory: 256
-        - name: build-resolver
-          memory: 4096
-        - name: repo-resolver
-          memory: 4096
+        - { name: polling,        cpu: [ 1.0, 1.5 ],  memory: [  256,  512 ] }
+        - { name: scheduler,      cpu: [ 0.2, 0.5 ],  memory: [   64,  128 ] }
+        - { name: build-resolver, cpu: [ 1.0, 1.5 ],  memory: [ 1024, 4096 ] }
+        - { name: repo-resolver,  cpu: [ 2.0, 8.0 ],  memory: [ 1024, 4096 ] }
       loop_control:
         label: "{{ item.name }}"
 
diff --git a/roles/openshift-apps/koschei/templates/backend-deployment.yml b/roles/openshift-apps/koschei/templates/backend-deployment.yml
index 5af4118963..dc132e4275 100644
--- a/roles/openshift-apps/koschei/templates/backend-deployment.yml
+++ b/roles/openshift-apps/koschei/templates/backend-deployment.yml
@@ -34,8 +34,12 @@ spec:
           subPath: krb5.keytab
           readOnly: true
         resources:
+          requests:
+            cpu: "{{ (1000 * min_cpu) | int }}m"
+            memory: "{{ min_mem }}Mi"
           limits:
-            memory: {{memory}}Mi
+            cpu: "{{ (1000 * max_cpu) | int }}m"
+            memory: "{{ max_mem }}Mi"
       volumes:
       - name: config
         secret: