Merge pull request #41 from craig-willis/NDS-536

NDS-536: Updated readiness probes and resource requirements

Author: craig-willis

clowder/clowder.json

@@ -81,11 +81,18 @@
         }
     ],
     "resourceLimits": {
-        "cpuMax": 500,
+        "cpuMax": 200,
         "cpuDefault": 100,
         "memMax": 1000,
         "memDefault": 250
     },
+    "readinessProbe" : {
+        "type" : "http",
+        "path" : "/assets/stylesheets/main.css",
+        "port" : 9000,
+        "initialDelay": 10,
+        "timeout" : 60
+    },
     "repositories": [
       {
         "url": "https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/clowder.git",

clowder/extractors/image-preview.json

@@ -31,7 +31,7 @@
         }
     ],
     "resourceLimits": {
-        "cpuMax": 1000,
+        "cpuMax": 200,
         "cpuDefault": 100,
         "memMax": 250,
         "memDefault": 25

clowder/extractors/plantcv.json

@@ -31,7 +31,7 @@
         }
     ],
     "resourceLimits": {
-        "cpuMax": 1000,
+        "cpuMax": 500,
         "cpuDefault": 100,
         "memMax": 250,
         "memDefault": 100

clowder/extractors/video-preview.json

@@ -31,7 +31,7 @@
         }
     ],
     "resourceLimits": {
-        "cpuMax": 1000,
+        "cpuMax": 200,
         "cpuDefault": 100,
         "memMax": 250,
         "memDefault": 25

dataverse/dataverse.json

@@ -65,13 +65,13 @@
         "type" : "http",
         "path" : "/healthcheck.txt",
         "port" : 8080,
-        "initialDelay": 120,
+        "initialDelay": 360,
         "timeout" : 600
     },
     "resourceLimits": {
         "cpuMax": 200,
         "cpuDefault": 100,
-        "memMax": 2000,
+        "memMax": 3000,
         "memDefault": 1000
     },
     "repositories": [

dataverse/solr.json

@@ -18,7 +18,7 @@
         "path" : "/solr",
         "port" : 8983,
         "initialDelay": 30,
-        "timeout" : 600
+        "timeout" : 360
     },
     "resourceLimits": {
         "cpuMax": 200,

dspace/dspace.json

@@ -49,7 +49,7 @@
         },
         {
             "name": "ADMIN_EMAIL",
-            "value": "",
+            "value": "$(NDSLABS_EMAIL)",
             "label": "Admin email",
             "isPassword": false,
             "canOverride": true
@@ -89,7 +89,7 @@
     "resourceLimits": {
         "cpuMax": 500,
         "cpuDefault": 100,
-        "memMax": 4000,
+        "memMax": 3000,
         "memDefault": 50
     },
     "tags": [

fedora/commons.json

@@ -34,7 +34,7 @@
         "path": "/images/fedora_logo_10in.png",
         "port": 8080,
         "initialDelay": 30,
-        "timeout": 45
+        "timeout": 120
     },
     "resourceLimits": {
         "cpuMax": 1000,

mongo/mongo.json

@@ -19,6 +19,13 @@
         "cpuDefault": 100,
         "memMax": 250,
         "memDefault": 100
+    },
+    "readinessProbe" : {
+        "type" : "tcp",
+        "path" : "",
+        "port" : 27017,
+        "initialDelay": 10,
+        "timeout" : 60
     },
 	"repositories" : [
 		{

system/cloudcmd.json

@@ -30,7 +30,7 @@
         "timeout": 45
     },
     "resourceLimits": {
-        "cpuMax": 500,
+        "cpuMax": 200,
         "cpuDefault": 100,
         "memMax": 1000,
         "memDefault": 50