You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2019/05/09 20:12:30 UTC

[incubator-openwhisk-deploy-kube] branch master updated: change default from nodejs:6 to nodejs:10 (mirror ow-4466) (#458)

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 9e54c22  change default from nodejs:6 to nodejs:10 (mirror ow-4466) (#458)
9e54c22 is described below

commit 9e54c22e84cd9e4d8737a72ae8d9a869f0cb53a7
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Thu May 9 16:12:25 2019 -0400

    change default from nodejs:6 to nodejs:10 (mirror ow-4466) (#458)
    
    change default from nodejs:6 to nodejs:10
    
    update for upstream changes from PRs ow-4466 and ow-4471
---
 helm/openwhisk/runtimes-minimal-travis.json | 22 ++++++++++++++++------
 helm/openwhisk/runtimes.json                | 20 ++++++++++----------
 helm/openwhisk/values.yaml                  |  8 ++++----
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/helm/openwhisk/runtimes-minimal-travis.json b/helm/openwhisk/runtimes-minimal-travis.json
index 5c28195..e7e273b 100644
--- a/helm/openwhisk/runtimes-minimal-travis.json
+++ b/helm/openwhisk/runtimes-minimal-travis.json
@@ -4,17 +4,27 @@
         "nodejs": [
             {
                 "kind": "nodejs:6",
-                "default": true,
+                "default": false,
                 "image": {
                     "prefix": "openwhisk",
                     "name": "nodejs6action",
-                    "tag": "c173d64"
+                    "tag": "ab224ab"
+                },
+                "deprecated": false
+            },
+            {
+                "kind": "nodejs:10",
+                "default": true,
+                "image": {
+                    "prefix": "openwhisk",
+                    "name": "action-nodejs-v10",
+                    "tag": "ab224ab"
                 },
                 "deprecated": false,
-                "stemCells": [{
-                    "count": 2,
-                    "memory": "256 MB"
-                }]
+                "attached": {
+                    "attachmentName": "codefile",
+                    "attachmentType": "text/plain"
+                }
             }
         ],
         "python": [
diff --git a/helm/openwhisk/runtimes.json b/helm/openwhisk/runtimes.json
index 571b7d4..9de0283 100644
--- a/helm/openwhisk/runtimes.json
+++ b/helm/openwhisk/runtimes.json
@@ -3,7 +3,7 @@
         "nodejs": [
             {
                 "kind": "nodejs:6",
-                "default": true,
+                "default": false,
                 "image": {
                     "prefix": "openwhisk",
                     "name": "nodejs6action",
@@ -13,13 +13,7 @@
                 "attached": {
                     "attachmentName": "codefile",
                     "attachmentType": "text/plain"
-                },
-                "stemCells": [
-                    {
-                        "count": 2,
-                        "memory": "256 MB"
-                    }
-                ]
+                }
             },
             {
                 "kind": "nodejs:8",
@@ -37,7 +31,7 @@
             },
             {
                 "kind": "nodejs:10",
-                "default": false,
+                "default": true,
                 "image": {
                     "prefix": "openwhisk",
                     "name": "action-nodejs-v10",
@@ -47,7 +41,13 @@
                 "attached": {
                     "attachmentName": "codefile",
                     "attachmentType": "text/plain"
-                }
+                },
+                "stemCells": [
+                    {
+                        "count": 2,
+                        "memory": "256 MB"
+                    }
+                ]
             },
             {
                 "kind": "nodejs:12",
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 9521f2d..752dfe8 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -113,7 +113,7 @@ whisk:
     openwhisk:
       buildDate: "2019-04-05-18:03:02Z"
       buildNo: "20190405a"
-      gitTag: "9ef3975419cf68dc3dc7fa6cc0db47d69dbcc2f8"
+      gitTag: "95afbb32aef61f8d278ee142d1cea7cead96a0ff"
     openwhiskCli:
       tag: "eaf64ae"
     openwhiskCatalog:
@@ -136,7 +136,7 @@ k8s:
 # Images used to run auxillary tasks/jobs
 utility:
   imageName: "openwhisk/ow-utils"
-  imageTag: "9ef3975"
+  imageTag: "95afbb3"
   imagePullPolicy: "IfNotPresent"
 
 # Docker registry
@@ -220,7 +220,7 @@ nginx:
 # Controller configurations
 controller:
   imageName: "openwhisk/controller"
-  imageTag: "9ef3975"
+  imageTag: "95afbb3"
   imagePullPolicy: "IfNotPresent"
   replicaCount: 1
   restartPolicy: "Always"
@@ -232,7 +232,7 @@ controller:
 # Invoker configurations
 invoker:
   imageName: "openwhisk/invoker"
-  imageTag: "9ef3975"
+  imageTag: "95afbb3"
   imagePullPolicy: "IfNotPresent"
   restartPolicy: "Always"
   port: 8080