Skip to content

Commit

Permalink
pare down runtime list to remove old/deprecated versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgrove-oss
dgrove-oss committed Jul 6, 2023
1 parent 8829c95 commit affee15
Show file tree
Hide file tree
Showing 27 changed files with 103 additions and 250 deletions.
6 changes: 3 additions & 3 deletions ansible/files/runtimes-nodeonly.json
View file
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
177 changes: 18 additions & 159 deletions ansible/files/runtimes.json
View file
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 @@ -14,47 +14,6 @@
],
"runtimes": {
"nodejs": [
{
"kind": "nodejs:14",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v14",
"tag": "nightly"
},
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
},
"stemCells": [
{
"initialCount": 2,
"memory": "256 MB",
"reactive": {
"minCount": 1,
"maxCount": 4,
"ttl": "2 minutes",
"threshold": 1,
"increment": 1
}
}
]
},
{
"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,
Expand All @@ -81,27 +40,26 @@
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
"stemCells": [
{
"initialCount": 2,
"memory": "256 MB",
"reactive": {
"minCount": 1,
"maxCount": 4,
"ttl": "2 minutes",
"threshold": 1,
"increment": 1
}
}
]
}
],
"python": [
{
"kind": "python:3",
"default": true,
"image": {
"prefix": "openwhisk",
"name": "action-python-v3.7",
"tag": "nightly"
},
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "python:3.10",
"default": false,
"default": true,
"image": {
"prefix": "openwhisk",
"name": "action-python-v3.10",
Expand Down Expand Up @@ -129,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 @@ -157,20 +101,6 @@
"attachmentType": "text/plain"
}
},
{
"kind": "swift:5.4",
"default": false,
"image": {
"prefix": "openwhisk",
"name": "action-swift-v5.4",
"tag": "nightly"
},
"deprecated": false,
"attached": {
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
},
{
"kind": "swift:5.7",
"default": false,
Expand Down Expand Up @@ -204,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 @@ -278,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 @@ -308,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
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
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
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
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
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
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

0 comments on commit affee15

Please sign in to comment.