From 36f6a242c69fc69c68165286eb92419595349509 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Tue, 11 Sep 2018 12:36:57 +0200
Subject: [PATCH] updated memory reservation of MOLGENIS container and updated
 notation of memory elastic

---
 molgenis/README.md     | 10 +++-------
 molgenis/questions.yml | 14 ++++++++++++--
 molgenis/values.yaml   |  4 ++--
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/molgenis/README.md b/molgenis/README.md
index 369a68d..c189ebc 100644
--- a/molgenis/README.md
+++ b/molgenis/README.md
@@ -64,19 +64,15 @@ You can specify the location of the OpenCPU cluster by specifying this property:
 You can test OpenCPU settings using the **OpenCPU**-helm chart of MOLGENIS.
 
 ## Resources
-You can specify resources by resource type. There are 3 resource types.
-- cpu's
+You can specify resources by resource type. There are 2 resource types.
 - memory of container
-- memory of JVM
-
-Specify number of cpu's:
-- ```molgenis.resources.limits.cpu```
+- maximum heap space JVM
 
 Specify memory usage of container:
 - ```molgenis.resources.limits.memory```
 
 Specify memory usage for Java JVM:
-- ```molgenis.javaOpts```
+- ```molgenis.javaOpts.maxHeapSpace```
 
 Select the resources you need dependant on the customer you need to serve.
 
diff --git a/molgenis/questions.yml b/molgenis/questions.yml
index 9712fae..445b12a 100644
--- a/molgenis/questions.yml
+++ b/molgenis/questions.yml
@@ -70,7 +70,17 @@ questions:
   - "2500Mi"
   required: true
   group: "Resources"
-  label: Container memory limit
+  label: Container memory reservation
+- variable: molgenis.resources.requests.memory
+  default: 1250Mi
+  description: "Memory reservation for this MOLGENIS container"
+  type: enum
+  options:
+  - "1250Mi"
+  - "2500Mi"
+  required: true
+  group: "Resources"
+  label: Container memory reservation
 - variable: molgenis.javaOpts.maxHeapSpace
   default: "1g"
   description: "Maximum heap space MOLGENIS container JVM. Please not this should fit in your container memory limit"
@@ -79,4 +89,4 @@ questions:
   - "1g"
   - "2g"
   group: "Resources"
-  label: Maximum heap space
+  label: Maximum heap space (JVM)
diff --git a/molgenis/values.yaml b/molgenis/values.yaml
index 844547e..f1e2622 100644
--- a/molgenis/values.yaml
+++ b/molgenis/values.yaml
@@ -30,7 +30,7 @@ molgenis:
     memory: 1250Mi
    requests:
     cpu: 200m
-    memory: 1Gi
+    memory: 1250Mi
   services:
     opencpu:
       host: localhost
@@ -48,7 +48,7 @@ elasticsearch:
     repository: docker.elastic.co/elasticsearch/elasticsearch
     tag: 5.5.3
     pullPolicy: IfNotPresent
-  javaOpts: "-Xms1024m -Xmx1024m"
+  javaOpts: "-Xms1g -Xmx1g"
   clusterName: molgenis
   resources:
    limits: