Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refresh runtimes list: add new versions; remove old/deprecated versions #5426

Merged
merged 3 commits into from
Jul 13, 2023
Merged

Refresh runtimes list: add new versions; remove old/deprecated versions #5426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8829c95
add the new versions of nodejs, python, and swift runtimes
dgrove-oss Jul 6, 2023
e1292e0
pare down runtime list to remove old/deprecated versions
dgrove-oss Jul 6, 2023
0bce466
NodeJS 20 is keeping a few more files open...
dgrove-oss Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible/files/runtimes-nodeonly.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"This file describes the different languages (aka. managed action runtimes) supported by the system",
"as well as blackbox images that support the runtime specification.",
"Only actions with runtime families / kinds defined here can be created / read / updated / deleted / invoked.",
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:14').",
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:20').",
"Each runtime family needs a default kind (default: true).",
"When removing or renaming runtime families or runtime kinds from this file, preexisting actions",
"with the affected kinds can no longer be read / updated / deleted / invoked. In order to remove or rename",
Expand All @@ -16,11 +16,11 @@
"runtimes": {
"nodejs": [
{
"kind": "nodejs:14",
"kind": "nodejs:20",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v14",
"name": "action-nodejs-v20",
"tag": "nightly"
},
"deprecated": false,
Expand Down
149 changes: 25 additions & 124 deletions ansible/files/runtimes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"This file describes the different languages (aka. managed action runtimes) supported by the system",
"as well as blackbox images that support the runtime specification.",
"Only actions with runtime families / kinds defined here can be created / read / updated / deleted / invoked.",
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:14').",
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:20').",
"Each runtime family needs a default kind (default: true).",
"When removing or renaming runtime families or runtime kinds from this file, preexisting actions",
"with the affected kinds can no longer be read / updated / deleted / invoked. In order to remove or rename",
Expand All @@ -15,11 +15,25 @@
"runtimes": {
"nodejs": [
{
"kind": "nodejs:14",
"kind": "nodejs:18",
"default": false,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v18",
"tag": "nightly"
},
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "nodejs:20",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v14",
"name": "action-nodejs-v20",
"tag": "nightly"
},
"deprecated": false,
Expand All @@ -40,43 +54,15 @@
}
}
]
},
{
"kind": "nodejs:16",
"default": false,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v16",
"tag": "nightly"
},
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "nodejs:18",
"default": false,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v18",
"tag": "nightly"
},
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
}
],
"python": [
{
"kind": "python:3",
"kind": "python:3.10",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "action-python-v3.7",
"name": "action-python-v3.10",
"tag": "nightly"
},
"deprecated": false,
Expand All @@ -86,11 +72,11 @@
}
},
{
"kind": "python:3.10",
"kind": "python:3.11",
"default": false,
"image": {
"prefix": "openwhisk",
"name": "action-python-v3.10",
"name": "action-python-v3.11",
"tag": "nightly"
},
"deprecated": false,
Expand All @@ -101,20 +87,6 @@
}
],
"swift": [
{
"kind": "swift:5.1",
"default": false,
"image": {
"prefix": "openwhisk",
"name": "action-swift-v5.1",
"tag": "nightly"
},
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "swift:5.3",
"default": true,
Expand All @@ -130,11 +102,11 @@
}
},
{
"kind": "swift:5.4",
"kind": "swift:5.7",
"default": false,
"image": {
"prefix": "openwhisk",
"name": "action-swift-v5.4",
"name": "action-swift-v5.7",
"tag": "nightly"
},
"deprecated": false,
Expand Down Expand Up @@ -162,51 +134,9 @@
}
],
"php": [
{
"kind": "php:7.3",
"default": false,
"deprecated": true,
"image": {
"prefix": "openwhisk",
"name": "action-php-v7.3",
"tag": "nightly"
},
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "php:7.4",
"default": true,
"deprecated": false,
"image": {
"prefix": "openwhisk",
"name": "action-php-v7.4",
"tag": "nightly"
},
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "php:8.0",
"default": false,
"deprecated": false,
"image": {
"prefix": "openwhisk",
"name": "action-php-v8.0",
"tag": "nightly"
},
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "php:8.1",
"default": false,
"default": true,
"deprecated": false,
"image": {
"prefix": "openwhisk",
Expand Down Expand Up @@ -236,23 +166,9 @@
}
],
"go": [
{
"kind": "go:1.17",
"default": true,
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
},
"image": {
"prefix": "openwhisk",
"name": "action-golang-v1.17",
"tag": "nightly"
}
},
{
"kind": "go:1.20",
"default": false,
"default": true,
"deprecated": false,
"attached": {
"attachmentName": "codefile",
Expand All @@ -266,21 +182,6 @@
}
],
"dotnet": [
{
"kind": "dotnet:2.2",
"default": false,
"deprecated": true,
"requireMain": true,
"image": {
"prefix": "openwhisk",
"name": "action-dotnet-v2.2",
"tag": "nightly"
},
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "dotnet:3.1",
"default": true,
Expand Down
12 changes: 3 additions & 9 deletions core/controller/src/main/resources/apiv1swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2001,29 +2001,23 @@
"blackbox",
"java:8",
"java:default",
"nodejs:14",
"nodejs:16",
"nodejs:18",
"nodejs:20",
"nodejs:default",
"php:7.3",
"php:7.4",
"php:8.0",
"php:8.1",
"php:default",
"python:3",
"python:3.10",
"python:3.11",
"python:default",
"ruby:2.5",
"ruby:default",
"go:1.17",
"go:1.20",
"go:default",
"sequence",
"swift:5.1",
"swift:5.3",
"swift:5.4",
"swift:5.7",
"swift:default",
"dotnet:2.2",
"dotnet:3.1",
"dotnet:6.0",
"dotnet:default",
Expand Down
2 changes: 1 addition & 1 deletion ...ents/src/test/scala/org/apache/openwhisk/core/monitoring/metrics/KamonRecorderTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class KamonRecorderTests extends KafkaSpecBase with BeforeAndAfterEach with Kamo
val namespaceGuest = "guest"
val actionWithCustomPackage = "apimgmt/createApi"
val actionWithDefaultPackage = "createApi"
val kind = "nodejs:14"
val kind = "nodejs:20"
val memory = 256

it should "push user events to kamon" in {
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/scala/org/apache/openwhisk/core/monitoring/metrics/PrometheusRecorderTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class PrometheusRecorderTests extends KafkaSpecBase with BeforeAndAfterEach with
val namespaceGuest = "guest"
val actionWithCustomPackage = "apimgmt/createApiOne"
val actionWithDefaultPackage = "createApi"
val kind = "nodejs:14"
val kind = "nodejs:20"
val memory = "256"
createCustomTopic(EventConsumer.userEventTopic)

Expand Down
2 changes: 1 addition & 1 deletion core/standalone/bin/waitready
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ wsk property set --apihost "http://$(hostname):3233" --auth "$AUTH"
until wsk action list 2>/dev/null >/dev/null
do sleep 1 ; echo server still not ready - retrying
done
wsk action update testme <(echo 'function main(){return {"ready":true}}') --kind nodejs:14
wsk action update testme <(echo 'function main(){return {"ready":true}}') --kind nodejs:20
until wsk action invoke testme -r 2>/dev/null | grep 'ready'
do sleep 1 ; echo server initializing...
done
Expand Down
4 changes: 2 additions & 2 deletions core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneOpenWhisk.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ object StandaloneOpenWhisk extends SLF4JLogging {
| "runtimes": {
| "nodejs": [
| {
| "kind": "nodejs:14",
| "kind": "nodejs:20",
| "default": true,
| "image": {
| "prefix": "openwhisk",
| "name": "action-nodejs-v14",
| "name": "action-nodejs-v20",
| "tag": "latest"
| },
| "deprecated": false,
Expand Down
10 changes: 5 additions & 5 deletions docs/actions-new.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ 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:14` or `php:7.4`.
as in `nodejs:20` or `php:8.1`.

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).
As an example, the following entry add a new runtime family called `nodejs` with a single kind
`nodejs:14`.
`nodejs:20`.

```json
{
"nodejs": [{
"kind": "nodejs:14",
"kind": "nodejs:20",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v10",
"name": "action-nodejs-v20",
"tag": "latest"
}
}]
Expand Down Expand Up @@ -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:14` becomes `nodejs-14.txt`.
For example, a plain text function for `nodejs:20` becomes `nodejs-20.txt`.

```js
function main(args) {
Expand Down
Loading
Loading