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

Merge pull request #177 from bparees/parameterize

Browse source 
parameterize imagestreamtag refs in templates
This commit is contained in:
Honza Horak 2018-04-30 12:00:39 +02:00 • committed by GitHub
commit 8d138f94d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
openshift/templates/nodejs-mongodb-persistent.json
View file

@ -104,7 +104,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "nodejs:6" "name": "nodejs:${NODEJS_VERSION}"
}, },
"env": [ "env": [
{ {
@ -326,7 +326,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "mongodb:3.2" "name": "mongodb:${MONGODB_VERSION}"
} }
} }
}, },
@ -448,6 +448,20 @@
"required": true, "required": true,
"value": "openshift" "value": "openshift"
}, },
{
"name": "NODEJS_VERSION",
"displayName": "Version of NodeJS Image",
"description": "Version of NodeJS image to be used (6, 8, or latest).",
"value": "8",
"required": true
},
{
"name": "MONGODB_VERSION",
"displayName": "Version of MongoDB Image",
"description": "Version of MongoDB image to be used (3.2, 3.4, or latest).",
"value": "3.4",
"required": true
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",

18
openshift/templates/nodejs-mongodb.json
View file

@ -105,7 +105,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "nodejs:6" "name": "nodejs:${NODEJS_VERSION}"
}, },
"env": [ "env": [
{ {
@ -310,7 +310,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "mongodb:3.2" "name": "mongodb:${MONGODB_VERSION}"
} }
} }
}, },
@ -432,6 +432,20 @@
"required": true, "required": true,
"value": "openshift" "value": "openshift"
}, },
{
"name": "NODEJS_VERSION",
"displayName": "Version of NodeJS Image",
"description": "Version of NodeJS image to be used (6, 8, or latest).",
"value": "8",
"required": true
},
{
"name": "MONGODB_VERSION",
"displayName": "Version of MongoDB Image",
"description": "Version of MongoDB image to be used (3.2, 3.4, or latest).",
"value": "3.4",
"required": true
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",

9
openshift/templates/nodejs.json
View file

@ -92,7 +92,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"namespace": "${NAMESPACE}", "namespace": "${NAMESPACE}",
"name": "nodejs:6" "name": "nodejs:${NODEJS_VERSION}"
}, },
"env": [ "env": [
{ {
@ -231,6 +231,13 @@
"required": true, "required": true,
"value": "openshift" "value": "openshift"
}, },
{
"name": "NODEJS_VERSION",
"displayName": "Version of NodeJS Image",
"description": "Version of NodeJS image to be used (6, 8, or latest).",
"value": "8",
"required": true
},
{ {
"name": "MEMORY_LIMIT", "name": "MEMORY_LIMIT",
"displayName": "Memory Limit", "displayName": "Memory Limit",