You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/06/18 21:27:53 UTC

[GitHub] dgrove-oss closed pull request #227: Update runtimes for upstream changes.

dgrove-oss closed pull request #227: Update runtimes for upstream changes.
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/227
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/helm/runtimes-minimal-travis.json b/helm/runtimes-minimal-travis.json
index 98ec32b..f299044 100644
--- a/helm/runtimes-minimal-travis.json
+++ b/helm/runtimes-minimal-travis.json
@@ -5,16 +5,24 @@
                 "kind": "nodejs:6",
                 "default": true,
                 "image": {
-                    "name": "nodejs6action"
+                    "prefix": "openwhisk",
+                    "name": "nodejs6action",
+                    "tag": "latest"
                 },
-                "deprecated": false
+                "deprecated": false,
+                "stemCells": [{
+                    "count": 2,
+                    "memory": "256 MB"
+                }]
             }
         ],
         "python": [
             {
                 "kind": "python:3",
                 "image": {
-                    "name": "python3action"
+                    "prefix": "openwhisk",
+                    "name": "python3action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -22,7 +30,9 @@
     },
     "blackboxes": [
         {
-            "name": "dockerskeleton"
+            "prefix": "openwhisk",
+            "name": "dockerskeleton",
+            "tag": "latest"
         }
     ]
 }
diff --git a/helm/runtimes.json b/helm/runtimes.json
index d0a2bd4..17b9326 100644
--- a/helm/runtimes.json
+++ b/helm/runtimes.json
@@ -4,7 +4,9 @@
             {
                 "kind": "nodejs",
                 "image": {
-                    "name": "nodejsaction"
+                    "prefix": "openwhisk",
+                    "name": "nodejsaction",
+                    "tag": "latest"
                 },
                 "deprecated": true
             },
@@ -12,7 +14,9 @@
                 "kind": "nodejs:6",
                 "default": true,
                 "image": {
-                    "name": "nodejs6action"
+                    "prefix": "openwhisk",
+                    "name": "nodejs6action",
+                    "tag": "latest"
                 },
                 "deprecated": false,
                 "stemCells": [{
@@ -24,7 +28,9 @@
                 "kind": "nodejs:8",
                 "default": false,
                 "image": {
-                    "name": "action-nodejs-v8"
+                    "prefix": "openwhisk",
+                    "name": "action-nodejs-v8",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -33,7 +39,9 @@
             {
                 "kind": "python",
                 "image": {
-                    "name": "python2action"
+                    "prefix": "openwhisk",
+                    "name": "python2action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             },
@@ -41,14 +49,18 @@
                 "kind": "python:2",
                 "default": true,
                 "image": {
-                    "name": "python2action"
+                    "prefix": "openwhisk",
+                    "name": "python2action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             },
             {
                 "kind": "python:3",
                 "image": {
-                    "name": "python3action"
+                    "prefix": "openwhisk",
+                    "name": "python3action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -57,7 +69,9 @@
             {
                 "kind": "swift:3.1.1",
                 "image": {
-                    "name": "action-swift-v3.1.1"
+                    "prefix": "openwhisk",
+                    "name": "action-swift-v3.1.1",
+                    "tag": "latest"
                 },
                 "deprecated": false
             },
@@ -65,7 +79,9 @@
                 "kind": "swift:4.1",
                 "default": true,
                 "image": {
-                    "name": "action-swift-v4.1"
+                    "prefix": "openwhisk",
+                    "name": "action-swift-v4.1",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -75,7 +91,9 @@
                 "kind": "java",
                 "default": true,
                 "image": {
-                    "name": "java8action"
+                    "prefix": "openwhisk",
+                    "name": "java8action",
+                    "tag": "latest"
                 },
                 "deprecated": false,
                 "attached": {
@@ -92,14 +110,18 @@
                 "default": true,
                 "deprecated": false,
                 "image": {
-                    "name": "action-php-v7.1"
+                    "prefix": "openwhisk",
+                    "name": "action-php-v7.1",
+                    "tag": "latest"
                 }
             }
         ]
     },
     "blackboxes": [
         {
-            "name": "dockerskeleton"
+            "prefix": "openwhisk",
+            "name": "dockerskeleton",
+            "tag": "latest"
         }
     ]
 }
diff --git a/kubernetes/cluster-setup/runtimes-minimal-travis.json b/kubernetes/cluster-setup/runtimes-minimal-travis.json
index 98ec32b..f299044 100644
--- a/kubernetes/cluster-setup/runtimes-minimal-travis.json
+++ b/kubernetes/cluster-setup/runtimes-minimal-travis.json
@@ -5,16 +5,24 @@
                 "kind": "nodejs:6",
                 "default": true,
                 "image": {
-                    "name": "nodejs6action"
+                    "prefix": "openwhisk",
+                    "name": "nodejs6action",
+                    "tag": "latest"
                 },
-                "deprecated": false
+                "deprecated": false,
+                "stemCells": [{
+                    "count": 2,
+                    "memory": "256 MB"
+                }]
             }
         ],
         "python": [
             {
                 "kind": "python:3",
                 "image": {
-                    "name": "python3action"
+                    "prefix": "openwhisk",
+                    "name": "python3action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -22,7 +30,9 @@
     },
     "blackboxes": [
         {
-            "name": "dockerskeleton"
+            "prefix": "openwhisk",
+            "name": "dockerskeleton",
+            "tag": "latest"
         }
     ]
 }
diff --git a/kubernetes/cluster-setup/runtimes.json b/kubernetes/cluster-setup/runtimes.json
index d0a2bd4..17b9326 100644
--- a/kubernetes/cluster-setup/runtimes.json
+++ b/kubernetes/cluster-setup/runtimes.json
@@ -4,7 +4,9 @@
             {
                 "kind": "nodejs",
                 "image": {
-                    "name": "nodejsaction"
+                    "prefix": "openwhisk",
+                    "name": "nodejsaction",
+                    "tag": "latest"
                 },
                 "deprecated": true
             },
@@ -12,7 +14,9 @@
                 "kind": "nodejs:6",
                 "default": true,
                 "image": {
-                    "name": "nodejs6action"
+                    "prefix": "openwhisk",
+                    "name": "nodejs6action",
+                    "tag": "latest"
                 },
                 "deprecated": false,
                 "stemCells": [{
@@ -24,7 +28,9 @@
                 "kind": "nodejs:8",
                 "default": false,
                 "image": {
-                    "name": "action-nodejs-v8"
+                    "prefix": "openwhisk",
+                    "name": "action-nodejs-v8",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -33,7 +39,9 @@
             {
                 "kind": "python",
                 "image": {
-                    "name": "python2action"
+                    "prefix": "openwhisk",
+                    "name": "python2action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             },
@@ -41,14 +49,18 @@
                 "kind": "python:2",
                 "default": true,
                 "image": {
-                    "name": "python2action"
+                    "prefix": "openwhisk",
+                    "name": "python2action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             },
             {
                 "kind": "python:3",
                 "image": {
-                    "name": "python3action"
+                    "prefix": "openwhisk",
+                    "name": "python3action",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -57,7 +69,9 @@
             {
                 "kind": "swift:3.1.1",
                 "image": {
-                    "name": "action-swift-v3.1.1"
+                    "prefix": "openwhisk",
+                    "name": "action-swift-v3.1.1",
+                    "tag": "latest"
                 },
                 "deprecated": false
             },
@@ -65,7 +79,9 @@
                 "kind": "swift:4.1",
                 "default": true,
                 "image": {
-                    "name": "action-swift-v4.1"
+                    "prefix": "openwhisk",
+                    "name": "action-swift-v4.1",
+                    "tag": "latest"
                 },
                 "deprecated": false
             }
@@ -75,7 +91,9 @@
                 "kind": "java",
                 "default": true,
                 "image": {
-                    "name": "java8action"
+                    "prefix": "openwhisk",
+                    "name": "java8action",
+                    "tag": "latest"
                 },
                 "deprecated": false,
                 "attached": {
@@ -92,14 +110,18 @@
                 "default": true,
                 "deprecated": false,
                 "image": {
-                    "name": "action-php-v7.1"
+                    "prefix": "openwhisk",
+                    "name": "action-php-v7.1",
+                    "tag": "latest"
                 }
             }
         ]
     },
     "blackboxes": [
         {
-            "name": "dockerskeleton"
+            "prefix": "openwhisk",
+            "name": "dockerskeleton",
+            "tag": "latest"
         }
     ]
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services