addition of memory limits with online beta in mind

sguha · Feb 17, 2016 · 6937fb0 · 6937fb0
1 parent 32a5b10
commit 6937fb0
Show file tree

Hide file tree

Showing 9 changed files with 167 additions and 47 deletions.
diff --git a/examples/db-templates/mongodb-ephemeral-template.json b/examples/db-templates/mongodb-ephemeral-template.json
@@ -48,8 +48,7 @@
       },
       "spec": {
         "strategy": {
-          "type": "Recreate",
-          "resources": {}
+          "type": "Recreate"
         },
         "triggers": [
           {
@@ -118,7 +117,11 @@
                     "value": "${MONGODB_ADMIN_PASSWORD}"
                   }
                 ],
-                "resources": {},
+                "resources": {
+		    "limits": {
+			"memory": "${MEMORY_LIMIT}"
+		    }
+		},
                 "volumeMounts": [
                   {
                     "name": "${DATABASE_SERVICE_NAME}-data",
@@ -151,34 +154,45 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the container can use",
+      "value": "384Mi"
+    },
     {
       "name": "DATABASE_SERVICE_NAME",
-      "description": "Database service name",
+      "displayName": "Database service name",
+      "description": "The name of the OpenShift Service exposed for the database",
       "value": "mongodb",
       "required": true
     },
     {
       "name": "MONGODB_USER",
+      "displayName": "MongoDB user",
       "description": "Username for MongoDB user that will be used for accessing the database",
       "generate": "expression",
       "from": "user[A-Z0-9]{3}",
       "required": true
     },
     {
       "name": "MONGODB_PASSWORD",
+      "displayName": "MongoDB password",
       "description": "Password for the MongoDB user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",
       "required": true
     },
     {
       "name": "MONGODB_DATABASE",
-      "description": "Database name",
+      "displayName": "MongoDB database name",
+      "description": "Name of the MongoDB database accessed",
       "value": "sampledb",
       "required": true
     },
     {
       "name": "MONGODB_ADMIN_PASSWORD",
+      "displayName": "MongoDB admin password",
       "description": "Password for the database admin user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",

diff --git a/examples/db-templates/mongodb-persistent-template.json b/examples/db-templates/mongodb-persistent-template.json
@@ -65,8 +65,7 @@
       },
       "spec": {
         "strategy": {
-          "type": "Recreate",
-          "resources": {}
+          "type": "Recreate"
         },
         "triggers": [
           {
@@ -135,7 +134,11 @@
                     "value": "${MONGODB_ADMIN_PASSWORD}"
                   }
                 ],
-                "resources": {},
+                "resources": {
+		    "limits": {
+			"memory": "${MEMORY_LIMIT}"
+		    }
+		},
                 "volumeMounts": [
                   {
                     "name": "${DATABASE_SERVICE_NAME}-data",
@@ -168,41 +171,53 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the container can use",
+      "value": "128Mi"
+    },
     {
       "name": "DATABASE_SERVICE_NAME",
-      "description": "Database service name",
+      "displayName": "Database service name",
+      "description": "The name of the OpenShift Service exposed for the database",
       "value": "mongodb",
       "required": true
     },
     {
       "name": "MONGODB_USER",
+      "displayName": "MongoDB user",
       "description": "Username for MongoDB user that will be used for accessing the database",
       "generate": "expression",
       "from": "user[A-Z0-9]{3}",
       "required": true
     },
     {
       "name": "MONGODB_PASSWORD",
+      "displayName": "MongoDB password",
       "description": "Password for the MongoDB user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",
       "required": true
     },
     {
       "name": "MONGODB_DATABASE",
-      "description": "Database name",
+      "displayName": "MongoDB database name",
+      "description": "Name of the MongoDB database accessed",
       "value": "sampledb",
       "required": true
     },
     {
       "name": "MONGODB_ADMIN_PASSWORD",
+      "displayName": "MongoDB admin password",
       "description": "Password for the database admin user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",
       "required": true
     },
     {
       "name": "VOLUME_CAPACITY",
+      "displayName": "Volume capacity",
       "description": "Volume space available for data, e.g. 512Mi, 2Gi",
       "value": "512Mi",
       "required": true

diff --git a/examples/db-templates/mysql-ephemeral-template.json b/examples/db-templates/mysql-ephemeral-template.json
@@ -48,8 +48,7 @@
       },
       "spec": {
         "strategy": {
-          "type": "Recreate",
-          "resources": {}
+          "type": "Recreate"
         },
         "triggers": [
           {
@@ -107,7 +106,11 @@
                     "value": "${MYSQL_DATABASE}"
                   }
                 ],
-                "resources": {},
+                "resources": {
+		    "limits": {
+			"memory": "${MEMORY_LIMIT}"
+		    }
+		},
                 "volumeMounts": [
                   {
                     "name": "${DATABASE_SERVICE_NAME}-data",
@@ -140,29 +143,39 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the container can use",
+      "value": "512Mi"
+    },
     {
       "name": "DATABASE_SERVICE_NAME",
-      "description": "Database service name",
+      "displayName": "Database service name",
+      "description": "The name of the OpenShift Service exposed for the database",
       "value": "mysql",
       "required": true
     },
     {
       "name": "MYSQL_USER",
+      "displayName": "MySQL user",
       "description": "Username for MySQL user that will be used for accessing the database",
       "generate": "expression",
       "from": "user[A-Z0-9]{3}",
       "required": true
     },
     {
       "name": "MYSQL_PASSWORD",
+      "displayName": "MySQL password",
       "description": "Password for the MySQL user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",
       "required": true
     },
     {
       "name": "MYSQL_DATABASE",
-      "description": "Database name",
+      "displayName": "MySQL database name",
+      "description": "Name of the MySQL database accessed",
       "value": "sampledb",
       "required": true
     }

diff --git a/examples/db-templates/mysql-persistent-template.json b/examples/db-templates/mysql-persistent-template.json
@@ -65,8 +65,7 @@
       },
       "spec": {
         "strategy": {
-          "type": "Recreate",
-          "resources": {}
+          "type": "Recreate"
         },
         "triggers": [
           {
@@ -124,7 +123,11 @@
                     "value": "${MYSQL_DATABASE}"
                   }
                 ],
-                "resources": {},
+                "resources": {
+		    "limits": {
+			"memory": "${MEMORY_LIMIT}"
+		    }
+		},
                 "volumeMounts": [
                   {
                     "name": "${DATABASE_SERVICE_NAME}-data",
@@ -157,34 +160,45 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the container can use",
+      "value": "512Mi"
+    },
     {
       "name": "DATABASE_SERVICE_NAME",
-      "description": "Database service name",
+      "displayName": "Database service name",
+      "description": "The name of the OpenShift Service exposed for the database",
       "value": "mysql",
       "required": true
     },
     {
       "name": "MYSQL_USER",
+      "displayName": "MySQL user",
       "description": "Username for MySQL user that will be used for accessing the database",
       "generate": "expression",
       "from": "user[A-Z0-9]{3}",
       "required": true
     },
     {
       "name": "MYSQL_PASSWORD",
+      "displayName": "MySQL password",
       "description": "Password for the MySQL user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",
       "required": true
     },
     {
       "name": "MYSQL_DATABASE",
-      "description": "Database name",
+      "displayName": "MySQL database name",
+      "description": "Name of the MySQL database accessed",
       "value": "sampledb",
       "required": true
     },
     {
       "name": "VOLUME_CAPACITY",
+      "displayName": "Volume capacity",
       "description": "Volume space available for data, e.g. 512Mi, 2Gi",
       "value": "512Mi",
       "required": true

diff --git a/examples/db-templates/postgresql-ephemeral-template.json b/examples/db-templates/postgresql-ephemeral-template.json
@@ -48,8 +48,7 @@
       },
       "spec": {
         "strategy": {
-          "type": "Recreate",
-          "resources": {}
+          "type": "Recreate"
         },
         "triggers": [
           {
@@ -107,7 +106,11 @@
                     "value": "${POSTGRESQL_DATABASE}"
                   }
                 ],
-                "resources": {},
+                "resources": {
+		    "limits": {
+			"memory": "${MEMORY_LIMIT}"
+		    }
+		},
                 "volumeMounts": [
                   {
                     "name": "${DATABASE_SERVICE_NAME}-data",
@@ -140,29 +143,39 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the container can use",
+      "value": "128Mi"
+    },
     {
       "name": "DATABASE_SERVICE_NAME",
-      "description": "Database service name",
+      "displayName": "Database service name",
+      "description": "The name of the OpenShift Service exposed for the database",
       "value": "postgresql",
       "required": true
     },
     {
       "name": "POSTGRESQL_USER",
+      "displayName": "PostgreSQL user",
       "description": "Username for PostgreSQL user that will be used for accessing the database",
       "generate": "expression",
       "from": "user[A-Z0-9]{3}",
       "required": true
     },
     {
       "name": "POSTGRESQL_PASSWORD",
+      "displayName": "PostgreSQL password",
       "description": "Password for the PostgreSQL user",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}",
       "required": true
     },
     {
       "name": "POSTGRESQL_DATABASE",
-      "description": "Database name",
+      "displayName": "PostgreSQL database name",
+      "description": "Name of the PostgreSQL database accessed",
       "value": "sampledb",
       "required": true
     }