Skip to content

Commit affee15

Browse files
dgrove-ossdgrove-oss
committed
pare down runtime list to remove old/deprecated versions
1 parent 8829c95 commit affee15

File tree

27 files changed

+103
-250
lines changed

27 files changed

+103
-250
lines changed

‎ansible/files/runtimes-nodeonly.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"This file describes the different languages (aka. managed action runtimes) supported by the system",
44
"as well as blackbox images that support the runtime specification.",
55
"Only actions with runtime families / kinds defined here can be created / read / updated / deleted / invoked.",
6-
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:14').",
6+
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:20').",
77
"Each runtime family needs a default kind (default: true).",
88
"When removing or renaming runtime families or runtime kinds from this file, preexisting actions",
99
"with the affected kinds can no longer be read / updated / deleted / invoked. In order to remove or rename",
@@ -16,11 +16,11 @@
1616
"runtimes": {
1717
"nodejs": [
1818
{
19-
"kind": "nodejs:14",
19+
"kind": "nodejs:20",
2020
"default": true,
2121
"image": {
2222
"prefix": "openwhisk",
23-
"name": "action-nodejs-v14",
23+
"name": "action-nodejs-v20",
2424
"tag": "nightly"
2525
},
2626
"deprecated": false,

‎ansible/files/runtimes.json

Lines changed: 18 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"This file describes the different languages (aka. managed action runtimes) supported by the system",
44
"as well as blackbox images that support the runtime specification.",
55
"Only actions with runtime families / kinds defined here can be created / read / updated / deleted / invoked.",
6-
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:14').",
6+
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:20').",
77
"Each runtime family needs a default kind (default: true).",
88
"When removing or renaming runtime families or runtime kinds from this file, preexisting actions",
99
"with the affected kinds can no longer be read / updated / deleted / invoked. In order to remove or rename",
@@ -14,47 +14,6 @@
1414
],
1515
"runtimes": {
1616
"nodejs": [
17-
{
18-
"kind": "nodejs:14",
19-
"default": true,
20-
"image": {
21-
"prefix": "openwhisk",
22-
"name": "action-nodejs-v14",
23-
"tag": "nightly"
24-
},
25-
"deprecated": false,
26-
"attached": {
27-
"attachmentName": "codefile",
28-
"attachmentType": "text/plain"
29-
},
30-
"stemCells": [
31-
{
32-
"initialCount": 2,
33-
"memory": "256 MB",
34-
"reactive": {
35-
"minCount": 1,
36-
"maxCount": 4,
37-
"ttl": "2 minutes",
38-
"threshold": 1,
39-
"increment": 1
40-
}
41-
}
42-
]
43-
},
44-
{
45-
"kind": "nodejs:16",
46-
"default": false,
47-
"image": {
48-
"prefix": "openwhisk",
49-
"name": "action-nodejs-v16",
50-
"tag": "nightly"
51-
},
52-
"deprecated": false,
53-
"attached": {
54-
"attachmentName": "codefile",
55-
"attachmentType": "text/plain"
56-
}
57-
},
5817
{
5918
"kind": "nodejs:18",
6019
"default": false,
@@ -81,27 +40,26 @@
8140
"attached": {
8241
"attachmentName": "codefile",
8342
"attachmentType": "text/plain"
84-
}
43+
},
44+
"stemCells": [
45+
{
46+
"initialCount": 2,
47+
"memory": "256 MB",
48+
"reactive": {
49+
"minCount": 1,
50+
"maxCount": 4,
51+
"ttl": "2 minutes",
52+
"threshold": 1,
53+
"increment": 1
54+
}
55+
}
56+
]
8557
}
8658
],
8759
"python": [
88-
{
89-
"kind": "python:3",
90-
"default": true,
91-
"image": {
92-
"prefix": "openwhisk",
93-
"name": "action-python-v3.7",
94-
"tag": "nightly"
95-
},
96-
"deprecated": false,
97-
"attached": {
98-
"attachmentName": "codefile",
99-
"attachmentType": "text/plain"
100-
}
101-
},
10260
{
10361
"kind": "python:3.10",
104-
"default": false,
62+
"default": true,
10563
"image": {
10664
"prefix": "openwhisk",
10765
"name": "action-python-v3.10",
@@ -129,20 +87,6 @@
12987
}
13088
],
13189
"swift": [
132-
{
133-
"kind": "swift:5.1",
134-
"default": false,
135-
"image": {
136-
"prefix": "openwhisk",
137-
"name": "action-swift-v5.1",
138-
"tag": "nightly"
139-
},
140-
"deprecated": false,
141-
"attached": {
142-
"attachmentName": "codefile",
143-
"attachmentType": "text/plain"
144-
}
145-
},
14690
{
14791
"kind": "swift:5.3",
14892
"default": true,
@@ -157,20 +101,6 @@
157101
"attachmentType": "text/plain"
158102
}
159103
},
160-
{
161-
"kind": "swift:5.4",
162-
"default": false,
163-
"image": {
164-
"prefix": "openwhisk",
165-
"name": "action-swift-v5.4",
166-
"tag": "nightly"
167-
},
168-
"deprecated": false,
169-
"attached": {
170-
"attachmentName": "codefile",
171-
"attachmentType": "text/plain"
172-
}
173-
},
174104
{
175105
"kind": "swift:5.7",
176106
"default": false,
@@ -204,51 +134,9 @@
204134
}
205135
],
206136
"php": [
207-
{
208-
"kind": "php:7.3",
209-
"default": false,
210-
"deprecated": true,
211-
"image": {
212-
"prefix": "openwhisk",
213-
"name": "action-php-v7.3",
214-
"tag": "nightly"
215-
},
216-
"attached": {
217-
"attachmentName": "codefile",
218-
"attachmentType": "text/plain"
219-
}
220-
},
221-
{
222-
"kind": "php:7.4",
223-
"default": true,
224-
"deprecated": false,
225-
"image": {
226-
"prefix": "openwhisk",
227-
"name": "action-php-v7.4",
228-
"tag": "nightly"
229-
},
230-
"attached": {
231-
"attachmentName": "codefile",
232-
"attachmentType": "text/plain"
233-
}
234-
},
235-
{
236-
"kind": "php:8.0",
237-
"default": false,
238-
"deprecated": false,
239-
"image": {
240-
"prefix": "openwhisk",
241-
"name": "action-php-v8.0",
242-
"tag": "nightly"
243-
},
244-
"attached": {
245-
"attachmentName": "codefile",
246-
"attachmentType": "text/plain"
247-
}
248-
},
249137
{
250138
"kind": "php:8.1",
251-
"default": false,
139+
"default": true,
252140
"deprecated": false,
253141
"image": {
254142
"prefix": "openwhisk",
@@ -278,23 +166,9 @@
278166
}
279167
],
280168
"go": [
281-
{
282-
"kind": "go:1.17",
283-
"default": true,
284-
"deprecated": false,
285-
"attached": {
286-
"attachmentName": "codefile",
287-
"attachmentType": "text/plain"
288-
},
289-
"image": {
290-
"prefix": "openwhisk",
291-
"name": "action-golang-v1.17",
292-
"tag": "nightly"
293-
}
294-
},
295169
{
296170
"kind": "go:1.20",
297-
"default": false,
171+
"default": true,
298172
"deprecated": false,
299173
"attached": {
300174
"attachmentName": "codefile",
@@ -308,21 +182,6 @@
308182
}
309183
],
310184
"dotnet": [
311-
{
312-
"kind": "dotnet:2.2",
313-
"default": false,
314-
"deprecated": true,
315-
"requireMain": true,
316-
"image": {
317-
"prefix": "openwhisk",
318-
"name": "action-dotnet-v2.2",
319-
"tag": "nightly"
320-
},
321-
"attached": {
322-
"attachmentName": "codefile",
323-
"attachmentType": "text/plain"
324-
}
325-
},
326185
{
327186
"kind": "dotnet:3.1",
328187
"default": true,

‎core/controller/src/main/resources/apiv1swagger.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,29 +2001,23 @@
20012001
"blackbox",
20022002
"java:8",
20032003
"java:default",
2004-
"nodejs:14",
20052004
"nodejs:16",
20062005
"nodejs:18",
2006+
"nodejs:20",
20072007
"nodejs:default",
2008-
"php:7.3",
2009-
"php:7.4",
2010-
"php:8.0",
20112008
"php:8.1",
20122009
"php:default",
2013-
"python:3",
20142010
"python:3.10",
2011+
"python:3.11",
20152012
"python:default",
20162013
"ruby:2.5",
20172014
"ruby:default",
2018-
"go:1.17",
20192015
"go:1.20",
20202016
"go:default",
20212017
"sequence",
2022-
"swift:5.1",
20232018
"swift:5.3",
2024-
"swift:5.4",
2019+
"swift:5.7",
20252020
"swift:default",
2026-
"dotnet:2.2",
20272021
"dotnet:3.1",
20282022
"dotnet:6.0",
20292023
"dotnet:default",

‎core/monitoring/user-events/src/test/scala/org/apache/openwhisk/core/monitoring/metrics/KamonRecorderTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class KamonRecorderTests extends KafkaSpecBase with BeforeAndAfterEach with Kamo
6262
val namespaceGuest = "guest"
6363
val actionWithCustomPackage = "apimgmt/createApi"
6464
val actionWithDefaultPackage = "createApi"
65-
val kind = "nodejs:14"
65+
val kind = "nodejs:20"
6666
val memory = 256
6767

6868
it should "push user events to kamon" in {

‎core/monitoring/user-events/src/test/scala/org/apache/openwhisk/core/monitoring/metrics/PrometheusRecorderTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class PrometheusRecorderTests extends KafkaSpecBase with BeforeAndAfterEach with
3838
val namespaceGuest = "guest"
3939
val actionWithCustomPackage = "apimgmt/createApiOne"
4040
val actionWithDefaultPackage = "createApi"
41-
val kind = "nodejs:14"
41+
val kind = "nodejs:20"
4242
val memory = "256"
4343
createCustomTopic(EventConsumer.userEventTopic)
4444

‎core/standalone/bin/waitready

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ wsk property set --apihost "http://$(hostname):3233" --auth "$AUTH"
2020
until wsk action list 2>/dev/null >/dev/null
2121
do sleep 1 ; echo server still not ready - retrying
2222
done
23-
wsk action update testme <(echo 'function main(){return {"ready":true}}') --kind nodejs:14
23+
wsk action update testme <(echo 'function main(){return {"ready":true}}') --kind nodejs:20
2424
until wsk action invoke testme -r 2>/dev/null | grep 'ready'
2525
do sleep 1 ; echo server initializing...
2626
done

‎core/standalone/src/main/scala/org/apache/openwhisk/standalone/StandaloneOpenWhisk.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ object StandaloneOpenWhisk extends SLF4JLogging {
175175
| "runtimes": {
176176
| "nodejs": [
177177
| {
178-
| "kind": "nodejs:14",
178+
| "kind": "nodejs:20",
179179
| "default": true,
180180
| "image": {
181181
| "prefix": "openwhisk",
182-
| "name": "action-nodejs-v14",
182+
| "name": "action-nodejs-v20",
183183
| "tag": "latest"
184184
| },
185185
| "deprecated": false,

‎docs/actions-new.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@ Further, you should automate and pass the following test suites:
6161
Actions when created specify the desired runtime for the function via a property called "kind".
6262
When using the `wsk` CLI, this is specified as `--kind <runtime-kind>`. The value is typically
6363
a string describing the language (e.g., `nodejs`) followed by a colon and the version for the runtime
64-
as in `nodejs:14` or `php:7.4`.
64+
as in `nodejs:20` or `php:8.1`.
6565

6666
The manifest is a map of runtime family names to an array of specific kinds. The details of the
6767
schema are found in the [Exec Manifest](../common/scala/src/main/scala/org/apache/openwhisk/core/entity/ExecManifest.scala).
6868
As an example, the following entry add a new runtime family called `nodejs` with a single kind
69-
`nodejs:14`.
69+
`nodejs:20`.
7070

7171
```json
7272
{
7373
"nodejs": [{
74-
"kind": "nodejs:14",
74+
"kind": "nodejs:20",
7575
"default": true,
7676
"image": {
7777
"prefix": "openwhisk",
78-
"name": "action-nodejs-v10",
78+
"name": "action-nodejs-v20",
7979
"tag": "latest"
8080
}
8181
}]
@@ -113,7 +113,7 @@ new language and added to the [test artifacts directory](../tests/dat/actions/un
113113
with the name `<runtime-kind>.txt` for plain text file or `<runtime-kind>.bin` for a
114114
a binary file. The `<runtime-kind>` must match the value used for `kind` in the corresponding
115115
runtime manifest entry, replacing `:` in the kind with a `-`.
116-
For example, a plain text function for `nodejs:14` becomes `nodejs-14.txt`.
116+
For example, a plain text function for `nodejs:20` becomes `nodejs-20.txt`.
117117

118118
```js
119119
function main(args) {

0 commit comments

Comments
 (0)