Merge pull request sclorg#177 from bparees/parameterize

parameterize imagestreamtag refs in templates
zapalotta · Apr 30, 2018 · 8d138f9 · 8d138f9
2 parents 93fc25f + d416548
commit 8d138f9
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/openshift/templates/nodejs-mongodb-persistent.json b/openshift/templates/nodejs-mongodb-persistent.json
@@ -104,7 +104,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "${NAMESPACE}",
-              "name": "nodejs:6"
+              "name": "nodejs:${NODEJS_VERSION}"
             },
             "env":  [
               {
@@ -326,7 +326,7 @@
               "from": {
                 "kind": "ImageStreamTag",
                 "namespace": "${NAMESPACE}",
-                "name": "mongodb:3.2"
+                "name": "mongodb:${MONGODB_VERSION}"
               }
             }
           },
@@ -448,6 +448,20 @@
       "required": true,
       "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",
       "displayName": "Memory Limit",

diff --git a/openshift/templates/nodejs-mongodb.json b/openshift/templates/nodejs-mongodb.json
@@ -105,7 +105,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "${NAMESPACE}",
-              "name": "nodejs:6"
+              "name": "nodejs:${NODEJS_VERSION}"
             },
             "env": [
               {
@@ -310,7 +310,7 @@
               "from": {
                 "kind": "ImageStreamTag",
                 "namespace": "${NAMESPACE}",
-                "name": "mongodb:3.2"
+                "name": "mongodb:${MONGODB_VERSION}"
               }
             }
           },
@@ -432,6 +432,20 @@
       "required": true,
       "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",
       "displayName": "Memory Limit",

diff --git a/openshift/templates/nodejs.json b/openshift/templates/nodejs.json
@@ -92,7 +92,7 @@
             "from": {
               "kind": "ImageStreamTag",
               "namespace": "${NAMESPACE}",
-              "name": "nodejs:6"
+              "name": "nodejs:${NODEJS_VERSION}"
             },
             "env":  [
               {
@@ -231,6 +231,13 @@
       "required": true,
       "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",
       "displayName": "Memory Limit",