vbatts
/
nodejs-ex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add default memory limit for deployments

This commit is contained in:
gabemontero 2016-02-24 23:01:42 -05:00
parent 34dafc6cdf
commit 5aa4e30ad9
2 changed files with 58 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
openshift/templates/nodejs-mongodb.json
View File

@ -188,7 +188,12 @@
"name": "MONGODB_ADMIN_PASSWORD",
"value": "${DATABASE_ADMIN_PASSWORD}"
}
]
],
"resources": {
"limits": {
"memory": "${MEMORY_LIMIT}"
}
}
}
]
}
@ -287,7 +292,12 @@
"name": "MONGODB_ADMIN_PASSWORD",
"value": "${DATABASE_ADMIN_PASSWORD}"
}
]
],
"resources": {
"limits": {
"memory": "${MEMORY_MONGODB_LIMIT}"
}
}
}
]
}
@ -296,60 +306,83 @@
}
],
"parameters": [
{
"name": "MEMORY_LIMIT",
"displayName": "Memory limit",
"description": "Maximum amount of memory the Node.js container can use",
"value": "128Mi"
},
{
"name": "MEMORY_MONGODB_LIMIT",
"displayName": "Memory limit",
"description": "Maximum amount of memory the MongoDB container can use",
"value": "384Mi"
},
{
"name": "SOURCE_REPOSITORY_URL",
"displayName": "Source repository URL",
"description": "The URL of the repository with your application source code",
"value": "https://github.com/openshift/nodejs-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 Node.js 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": "GENERIC_WEBHOOK_SECRET",
"displayName": "Generic webhook secret",
"description": "A secret string used to configure the Generic webhook",
"generate": "expression",
"from": "[a-zA-Z0-9]{40}"
},
{
"name": "DATABASE_SERVICE_NAME",
"displayName": "Database service name",
"description": "Database service name",
"value": "mongodb"
},
{
"name": "DATABASE_USER",
"displayName": "MongoDB user name",
"description": "Username for MongoDB user that will be used for accessing the database",
"generate": "expression",
"from": "user[A-Z0-9]{3}"
},
{
"name": "DATABASE_PASSWORD",
"displayName": "MongoDB password",
"description": "Password for the MongoDB user",
"generate": "expression",
"from": "[a-zA-Z0-9]{16}"
},
{
"name": "DATABASE_NAME",
"displayName": "Database name",
"description": "Database name",
"value": "sampledb"
},
{
"name": "DATABASE_ADMIN_PASSWORD",
"displayName": "Database administrator password",
"description": "Password for the database admin user",
"generate": "expression",
"from": "[a-zA-Z0-9]{16}"

24
openshift/templates/nodejs.json
View File

@ -188,7 +188,12 @@
"name": "MONGODB_ADMIN_PASSWORD",
"value": "${MONGODB_ADMIN_PASSWORD}"
}
]
],
"resources": {
"limits": {
"memory": "${MEMORY_LIMIT}"
}
}
}
]
}
@ -197,54 +202,71 @@
}
],
"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/nodejs-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 Node.js 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": "GENERIC_WEBHOOK_SECRET",
"displayName": "Generic webhook secret",
"description": "A secret string used to configure the Generic webhook",
"generate": "expression",
"from": "[a-zA-Z0-9]{40}"
},
{
"name": "DATABASE_SERVICE_NAME",
"displayName": "Database service name",
"description": "Database service name"
},
{
"name": "MONGODB_USER",
"displayName": "MongoDB user name",
"description": "Username for MongoDB user that will be used for accessing the database"
},
{
"name": "MONGODB_PASSWORD",
"displayName": "MongoDB password",
"description": "Password for the MongoDB user"
},
{
"name": "MONGODB_DATABASE",
"displayName": "Database name",
"description": "Database name"
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"displayName": "Database administrator password",
"description": "Password for the database admin user"
}
]