add mem limit for deployments

gabemontero · gabemontero · commit 7191b87d4353 · 2016-02-24T18:28:13.000-05:00
diff --git a/openshift/templates/django-postgresql.json b/openshift/templates/django-postgresql.json
@@ -193,7 +193,12 @@
                     "name": "DJANGO_SECRET_KEY",
                     "value": "${DJANGO_SECRET_KEY}"
                   }
-                ]
+                ],
+                "resources": {
+		      "limits": {
+			  "memory": "${MEMORY_LIMIT}"
+		      }
+                }
               }
             ]
           }
@@ -288,7 +293,12 @@
                     "name": "POSTGRESQL_DATABASE",
                     "value": "${DATABASE_NAME}"
                   }
-                ]
+                ],
+                "resources": {
+		      "limits": {
+			  "memory": "${MEMORY_POSTGRESQL_LIMIT}"
+		      }
+                }
               }
             ]
           }
@@ -297,62 +307,86 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the Django container can use",
+      "value": "128Mi"
+    },
+    {
+      "name": "MEMORY_POSTGRESQL_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the PostgreSQL container can use",
+      "value": "128Mi"
+    },
     {
       "name": "SOURCE_REPOSITORY_URL",
+      "displayName": "Source repository URL",
       "description": "The URL of the repository with your application source code",
       "value": "https://github.com/openshift/django-ex.git"
     },
     {
       "name": "SOURCE_REPOSITORY_REF",
+      "displayName": "Source repository reference",
       "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch"
     },
     {
       "name": "CONTEXT_DIR",
+      "displayName": "Context directory",
       "description": "Set this to the relative path to your project if it is not in the root of your repository"
     },
     {
       "name": "APPLICATION_DOMAIN",
+      "displayName": "Application hostname",
       "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
       "value": ""
     },
     {
       "name": "GITHUB_WEBHOOK_SECRET",
+      "displayName": "GitHub webhook secret",
       "description": "A secret string used to configure the GitHub webhook",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{40}"
     },
     {
       "name": "DATABASE_SERVICE_NAME",
+      "displayName": "Database service name",
       "description": "Database service name",
       "value": "postgresql"
     },
     {
       "name": "DATABASE_ENGINE",
+      "displayName": "Database engine",
       "description": "Database engine: postgresql, mysql or sqlite (default)",
       "value": "postgresql"
     },
     {
       "name": "DATABASE_NAME",
+      "displayName": "Database name",
       "description": "Database name",
       "value": "default"
     },
     {
       "name": "DATABASE_USER",
+      "displayName": "Database user name",
       "description": "Database user name",
       "value": "django"
     },
     {
       "name": "DATABASE_PASSWORD",
+      "displayName": "Database user password",
       "description": "Database user password",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{16}"
     },
     {
       "name": "APP_CONFIG",
+      "displayName": "Application configuration file path",
       "description": "Relative path to Gunicorn configuration file (optional)"
     },
     {
       "name": "DJANGO_SECRET_KEY",
+      "displayName": "Djange secret key",
       "description": "Set this to a long random string",
       "generate": "expression",
       "from": "[\\w]{50}"
diff --git a/openshift/templates/django.json b/openshift/templates/django.json
@@ -193,7 +193,12 @@
                     "name": "DJANGO_SECRET_KEY",
                     "value": "${DJANGO_SECRET_KEY}"
                   }
-                ]
+                ],
+                "resources": {
+		      "limits": {
+			  "memory": "${MEMORY_LIMIT}"
+		      }
+                }
               }
             ]
           }
@@ -202,56 +207,74 @@
     }
   ],
   "parameters": [
+    {
+      "name": "MEMORY_LIMIT",
+      "displayName": "Memory limit",
+      "description": "Maximum amount of memory the container can use",
+      "value": "128Mi"
+    },
     {
       "name": "SOURCE_REPOSITORY_URL",
+      "displayName": "Source repository URL",
       "description": "The URL of the repository with your application source code",
       "value": "https://github.com/openshift/django-ex.git"
     },
     {
       "name": "SOURCE_REPOSITORY_REF",
+      "displayName": "Source repository reference",
       "description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch"
     },
     {
       "name": "CONTEXT_DIR",
+      "displayName": "Context directory",
       "description": "Set this to the relative path to your project if it is not in the root of your repository"
     },
     {
       "name": "APPLICATION_DOMAIN",
+      "displayName": "Application hostname",
       "description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",
       "value": ""
     },
     {
       "name": "GITHUB_WEBHOOK_SECRET",
+      "displayName": "GitHub webhook secret",
       "description": "A secret string used to configure the GitHub webhook",
       "generate": "expression",
       "from": "[a-zA-Z0-9]{40}"
     },
     {
       "name": "DATABASE_SERVICE_NAME",
+      "displayName": "Database service name",
       "description": "Database service name"
     },
     {
       "name": "DATABASE_ENGINE",
+      "displayName": "Database engine",
       "description": "Database engine: postgresql, mysql or sqlite (default)"
     },
     {
       "name": "DATABASE_NAME",
+      "displayName": "Database name",
       "description": "Database name"
     },
     {
       "name": "DATABASE_USER",
+      "displayName": "Database user name",
       "description": "Database user name"
     },
     {
       "name": "DATABASE_PASSWORD",
+      "displayName": "Database user password",
       "description": "Database user password"
     },
     {
       "name": "APP_CONFIG",
+      "displayName": "Application configuration file path",
       "description": "Relative path to Gunicorn configuration file (optional)"
     },
     {
       "name": "DJANGO_SECRET_KEY",
+      "displayName": "Djange secret key",
       "description": "Set this to a long random string",
       "generate": "expression",
       "from": "[\\w]{50}"

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,12 @@`
`193`	`193`	`"name": "DJANGO_SECRET_KEY",`
`194`	`194`	`"value": "${DJANGO_SECRET_KEY}"`
`195`	`195`	`}`
`196`		`- ]`
	`196`	`+ ],`
	`197`	`+ "resources": {`
	`198`	`+ "limits": {`
	`199`	`+ "memory": "${MEMORY_LIMIT}"`
	`200`	`+ }`
	`201`	`+ }`
`197`	`202`	`}`
`198`	`203`	`]`
`199`	`204`	`}`
`@@ -202,56 +207,74 @@`
`202`	`207`	`}`
`203`	`208`	`],`
`204`	`209`	`"parameters": [`
	`210`	`+ {`
	`211`	`+ "name": "MEMORY_LIMIT",`
	`212`	`+ "displayName": "Memory limit",`
	`213`	`+ "description": "Maximum amount of memory the container can use",`
	`214`	`+ "value": "128Mi"`
	`215`	`+ },`
`205`	`216`	`{`
`206`	`217`	`"name": "SOURCE_REPOSITORY_URL",`
	`218`	`+ "displayName": "Source repository URL",`
`207`	`219`	`"description": "The URL of the repository with your application source code",`
`208`	`220`	`"value": "https://github.com/openshift/django-ex.git"`
`209`	`221`	`},`
`210`	`222`	`{`
`211`	`223`	`"name": "SOURCE_REPOSITORY_REF",`
	`224`	`+ "displayName": "Source repository reference",`
`212`	`225`	`"description": "Set this to a branch name, tag or other ref of your repository if you are not using the default branch"`
`213`	`226`	`},`
`214`	`227`	`{`
`215`	`228`	`"name": "CONTEXT_DIR",`
	`229`	`+ "displayName": "Context directory",`
`216`	`230`	`"description": "Set this to the relative path to your project if it is not in the root of your repository"`
`217`	`231`	`},`
`218`	`232`	`{`
`219`	`233`	`"name": "APPLICATION_DOMAIN",`
	`234`	`+ "displayName": "Application hostname",`
`220`	`235`	`"description": "The exposed hostname that will route to the Django service, if left blank a value will be defaulted.",`
`221`	`236`	`"value": ""`
`222`	`237`	`},`
`223`	`238`	`{`
`224`	`239`	`"name": "GITHUB_WEBHOOK_SECRET",`
	`240`	`+ "displayName": "GitHub webhook secret",`
`225`	`241`	`"description": "A secret string used to configure the GitHub webhook",`
`226`	`242`	`"generate": "expression",`
`227`	`243`	`"from": "[a-zA-Z0-9]{40}"`
`228`	`244`	`},`
`229`	`245`	`{`
`230`	`246`	`"name": "DATABASE_SERVICE_NAME",`
	`247`	`+ "displayName": "Database service name",`
`231`	`248`	`"description": "Database service name"`
`232`	`249`	`},`
`233`	`250`	`{`
`234`	`251`	`"name": "DATABASE_ENGINE",`
	`252`	`+ "displayName": "Database engine",`
`235`	`253`	`"description": "Database engine: postgresql, mysql or sqlite (default)"`
`236`	`254`	`},`
`237`	`255`	`{`
`238`	`256`	`"name": "DATABASE_NAME",`
	`257`	`+ "displayName": "Database name",`
`239`	`258`	`"description": "Database name"`
`240`	`259`	`},`
`241`	`260`	`{`
`242`	`261`	`"name": "DATABASE_USER",`
	`262`	`+ "displayName": "Database user name",`
`243`	`263`	`"description": "Database user name"`
`244`	`264`	`},`
`245`	`265`	`{`
`246`	`266`	`"name": "DATABASE_PASSWORD",`
	`267`	`+ "displayName": "Database user password",`
`247`	`268`	`"description": "Database user password"`
`248`	`269`	`},`
`249`	`270`	`{`
`250`	`271`	`"name": "APP_CONFIG",`
	`272`	`+ "displayName": "Application configuration file path",`
`251`	`273`	`"description": "Relative path to Gunicorn configuration file (optional)"`
`252`	`274`	`},`
`253`	`275`	`{`
`254`	`276`	`"name": "DJANGO_SECRET_KEY",`
	`277`	`+ "displayName": "Djange secret key",`
`255`	`278`	`"description": "Set this to a long random string",`
`256`	`279`	`"generate": "expression",`
`257`	`280`	`"from": "[\\w]{50}"`