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/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 6fcfc37 remove nodejs:6 and nodejs:8 (#4930)
6fcfc37 is described below
commit 6fcfc37a03727d60004bac557744fa8ab07f7bfb
Author: David Grove <[email protected]>
AuthorDate: Fri Jul 17 14:04:29 2020 -0400
remove nodejs:6 and nodejs:8 (#4930)
Remove all references to EOL NodeJS v6 and v8 runtimes.
---
ansible/files/runtimes.json | 28 -----------------
.../src/main/resources/apiv1swagger.json | 1 -
docs/actions-new.md | 4 +--
docs/actions-nodejs.md | 11 ++-----
docs/concurrency.md | 2 +-
.../core/entity/test/ExecManifestTests.scala | 36 +++++++++++-----------
.../openwhisk/core/entity/test/SchemaTests.scala | 2 +-
tools/owperf/setup.sh | 2 +-
8 files changed, 25 insertions(+), 61 deletions(-)
diff --git a/ansible/files/runtimes.json b/ansible/files/runtimes.json
index 722bbfc..c236451 100644
--- a/ansible/files/runtimes.json
+++ b/ansible/files/runtimes.json
@@ -15,34 +15,6 @@
"runtimes": {
"nodejs": [
{
- "kind": "nodejs:6",
- "default": false,
- "image": {
- "prefix": "openwhisk",
- "name": "nodejs6action",
- "tag": "nightly"
- },
- "deprecated": true,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "nodejs:8",
- "default": false,
- "image": {
- "prefix": "openwhisk",
- "name": "action-nodejs-v8",
- "tag": "nightly"
- },
- "deprecated": true,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
"kind": "nodejs:10",
"default": true,
"image": {
diff --git a/core/controller/src/main/resources/apiv1swagger.json
b/core/controller/src/main/resources/apiv1swagger.json
index 9255234..563d645 100644
--- a/core/controller/src/main/resources/apiv1swagger.json
+++ b/core/controller/src/main/resources/apiv1swagger.json
@@ -1930,7 +1930,6 @@
"blackbox",
"java:8",
"java:default",
- "nodejs:8",
"nodejs:10",
"nodejs:12",
"nodejs:14",
diff --git a/docs/actions-new.md b/docs/actions-new.md
index 664c2a9..2aea2e1 100644
--- a/docs/actions-new.md
+++ b/docs/actions-new.md
@@ -61,7 +61,7 @@ Further, you should automate and pass the following test
suites:
Actions when created specify the desired runtime for the function via a
property called "kind".
When using the `wsk` CLI, this is specified as `--kind <runtime-kind>`. The
value is typically
a string describing the language (e.g., `nodejs`) followed by a colon and the
version for the runtime
-as in `nodejs:8` or `php:7.4`.
+as in `nodejs:10` or `php:7.4`.
The manifest is a map of runtime family names to an array of specific kinds.
The details of the
schema are found in the [Exec
Manifest](../common/scala/src/main/scala/org/apache/openwhisk/core/entity/ExecManifest.scala).
@@ -113,7 +113,7 @@ new language and added to the [test artifacts
directory](../tests/dat/actions/un
with the name `<runtime-kind>.txt` for plain text file or `<runtime-kind>.bin`
for a
a binary file. The `<runtime-kind>` must match the value used for `kind` in
the corresponding
runtime manifest entry, replacing `:` in the kind with a `-`.
-For example, a plain text function for `nodejs:8` becomes `nodejs-8.txt`.
+For example, a plain text function for `nodejs:10` becomes `nodejs-10.txt`.
```js
function main(args) {
diff --git a/docs/actions-nodejs.md b/docs/actions-nodejs.md
index b5c52bd..8150be0 100644
--- a/docs/actions-nodejs.md
+++ b/docs/actions-nodejs.md
@@ -43,7 +43,7 @@ and demonstrate how to bundle multiple JavaScript files and
third party dependen
The CLI automatically infers the type of the action by using the source file
extension.
For `.js` source files, the action runs by using a Node.js runtime. You may
specify
- the Node.js runtime to use by explicitly specifying the parameter `--kind
nodejs:14`, `--kind nodejs:12`, `--kind nodejs:10`, or `--kind nodejs:8`.
+ the Node.js runtime to use by explicitly specifying the parameter `--kind
nodejs:14`, `--kind nodejs:12`, or `--kind nodejs:10`.
## Creating asynchronous actions
@@ -222,7 +222,7 @@ zip -r action.zip *
wsk action create packageAction --kind nodejs:10 action.zip
```
-When creating an action from a `.zip` archive with the CLI tool, you must
explicitly provide a value for the `--kind` flag by using `nodejs:12`,
`nodejs:10`, `nodejs:8` or `nodejs:6`.
+When creating an action from a `.zip` archive with the CLI tool, you must
explicitly provide a value for the `--kind` flag by using `nodejs:12`, or
`nodejs:10`.
- Invoke the action as normal.
@@ -462,13 +462,6 @@ wsk action invoke my-action --result --param lines "[\"and
now\", \"for somethin
JavaScript actions can be executed in Node.js version 8, 10, 12 or 14.
Currently actions are executed by default in a Node.js version 10 environment.
-### Node.js version 8 environment
-The Node.js version 8 environment is used if the `--kind` flag is explicitly
specified with a value of 'nodejs:8' when creating or updating an Action.
-
-The following packages are pre-installed in the Node.js version 8 environment:
-
-- [openwhisk](https://www.npmjs.com/package/openwhisk) - JavaScript client
library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk
APIs.
-
### Node.js version 10 environment
The Node.js version 10 environment is used if the `--kind` flag is explicitly
specified with a value of 'nodejs:10' when creating or updating an Action.
diff --git a/docs/concurrency.md b/docs/concurrency.md
index 106a624..6874714 100644
--- a/docs/concurrency.md
+++ b/docs/concurrency.md
@@ -29,7 +29,7 @@ Concurrent activation processing within the same action
container can be enabled
* enable the akka http client at invoker config
* e.g. CONFIG_whisk_containerPool_akkaClient=true
-* use a kind that supports concurrency (currently only `nodejs:14`,
`nodejs:12`, `nodejs:10`, and `nodejs:8`)
+* use a kind that supports concurrency (currently only `nodejs:14`,
`nodejs:12`, and `nodejs:10`)
* enable concurrency at runtime container env (nodejs container only allows
concurrency when started with an env var __OW_ALLOW_CONCURRENT=true)
* e.g.
CONFIG_whisk_containerFactory_containerArgs_extraArgs_env_0="__OW_ALLOW_CONCURRENT=true"
* disable log collection at invoker
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ExecManifestTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ExecManifestTests.scala
index dcc9077..7ed183e 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ExecManifestTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/ExecManifestTests.scala
@@ -270,7 +270,7 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
|{ "runtimes": {
| "nodef": [
| {
- | "kind": "nodejs:8",
+ | "kind": "nodejs:10",
| "default": true,
| "image": {
| "name": "nodejsaction"
@@ -283,7 +283,7 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
| "memory": "256 MB"
| }]
| }, {
- | "kind": "nodejs:10",
+ | "kind": "nodejs:12",
| "deprecated": true,
| "image": {
| "name": "nodejsaction"
@@ -321,13 +321,13 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
|}
|""".stripMargin.parseJson.asJsObject
- val js8 = RuntimeManifest(
- "nodejs:8",
+ val js10 = RuntimeManifest(
+ "nodejs:10",
ImageName("nodejsaction"),
default = Some(true),
stemCells = Some(List(StemCell(1, 128.MB), StemCell(1, 256.MB))))
- val js10 = RuntimeManifest(
- "nodejs:10",
+ val js12 = RuntimeManifest(
+ "nodejs:12",
ImageName("nodejsaction"),
deprecated = Some(true),
stemCells = Some(List(StemCell(1, 128.MB))))
@@ -339,7 +339,7 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
mf shouldBe {
Runtimes(
Set(
- RuntimeFamily("nodef", Set(js8, js10)),
+ RuntimeFamily("nodef", Set(js10, js12)),
RuntimeFamily("pythonf", Set(py)),
RuntimeFamily("swiftf", Set(sw)),
RuntimeFamily("phpf", Set(ph))),
@@ -353,9 +353,9 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
(m.kind, m.image, c.initialCount, c.memory)
}
}.toList should contain theSameElementsAs List(
- (js8.kind, js8.image, 1, 128.MB),
- (js8.kind, js8.image, 1, 256.MB),
(js10.kind, js10.image, 1, 128.MB),
+ (js10.kind, js10.image, 1, 256.MB),
+ (js12.kind, js12.image, 1, 128.MB),
(py.kind, py.image, 2, 256.MB))
}
@@ -364,7 +364,7 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
|{ "runtimes": {
| "nodef": [
| {
- | "kind": "nodejs:8",
+ | "kind": "nodejs:10",
| "default": true,
| "image": {
| "name": "nodejsaction"
@@ -391,7 +391,7 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
| }
| }]
| }, {
- | "kind": "nodejs:10",
+ | "kind": "nodejs:12",
| "deprecated": true,
| "image": {
| "name": "nodejsaction"
@@ -444,13 +444,13 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
|""".stripMargin.parseJson.asJsObject
val reactive = Some(ReactivePrewarmingConfig(1, 4, FiniteDuration(2,
TimeUnit.MINUTES), 1, 1))
- val js8 = RuntimeManifest(
- "nodejs:8",
+ val js10 = RuntimeManifest(
+ "nodejs:10",
ImageName("nodejsaction"),
default = Some(true),
stemCells = Some(List(StemCell(1, 128.MB, reactive), StemCell(1, 256.MB,
reactive))))
- val js10 = RuntimeManifest(
- "nodejs:10",
+ val js12 = RuntimeManifest(
+ "nodejs:12",
ImageName("nodejsaction"),
deprecated = Some(true),
stemCells = Some(List(StemCell(1, 128.MB, reactive))))
@@ -462,7 +462,7 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
mf shouldBe {
Runtimes(
Set(
- RuntimeFamily("nodef", Set(js8, js10)),
+ RuntimeFamily("nodef", Set(js10, js12)),
RuntimeFamily("pythonf", Set(py)),
RuntimeFamily("swiftf", Set(sw)),
RuntimeFamily("phpf", Set(ph))),
@@ -476,9 +476,9 @@ class ExecManifestTests extends FlatSpec with
WskActorSystem with StreamLogging
(m.kind, m.image, c.initialCount, c.memory)
}
}.toList should contain theSameElementsAs List(
- (js8.kind, js8.image, 1, 128.MB),
- (js8.kind, js8.image, 1, 256.MB),
(js10.kind, js10.image, 1, 128.MB),
+ (js10.kind, js10.image, 1, 256.MB),
+ (js12.kind, js12.image, 1, 128.MB),
(py.kind, py.image, 2, 256.MB))
}
}
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
index 42fb0d0..7b6cad4 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
@@ -493,7 +493,7 @@ class SchemaTests extends FlatSpec with BeforeAndAfter with
ExecHelpers with Mat
it should "initialize exec manifest" in {
val runtimes = ExecManifest.runtimesManifest
val kind = runtimes.resolveDefaultRuntime("nodejs:default").get.kind
- Some(kind) should contain oneOf ("nodejs:6", "nodejs:8", "nodejs:10")
+ Some(kind) should contain oneOf ("nodejs:10", "nodejs:12")
}
it should "properly deserialize and reserialize JSON" in {
diff --git a/tools/owperf/setup.sh b/tools/owperf/setup.sh
index 0c62d51..91397a6 100755
--- a/tools/owperf/setup.sh
+++ b/tools/owperf/setup.sh
@@ -58,7 +58,7 @@ function remove_assets() {
function deploy_assets() {
# Create action
- wsk action create testAction testAction.js --kind nodejs:8 $@
+ wsk action create testAction testAction.js --kind nodejs:default $@
# Create trigger after deleting it
wsk trigger create testTrigger $@
