Skip to content

Commit 7f81ddc

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

19 files changed

+65
-206
lines changed

‎ansible/files/runtimes-nodeonly.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 17 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -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,

‎tests/dat/actions/echo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"publish": false,
55
"exec": {
6-
"kind": "nodejs:14",
6+
"kind": "nodejs:20",
77
"code": "/**\n * Returns params, or an empty string if no parameter values are provided\n */\nfunction main(params) {\n return params || {};\n}\n\n"
88
},
99
"annotations": [],

‎tests/dat/actions/word_count.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"publish": false,
55
"exec": {
6-
"kind": "nodejs:14",
6+
"kind": "nodejs:20",
77
"code": "/**\n * word count utility\n */\nfunction main(params) {\n var str = params.payload.toString();\n var words = str.split(\" \");\n var count = words.length;\n console.log(\"The message '\"+str+\"' has\", count, 'words');\n return { count: count };\n}\n"
88
},
99
"annotations": [],

‎tests/src/test/scala/org/apache/openwhisk/core/admin/WskAdminTests.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,12 @@ class WskAdminTests extends TestHelpers with WskActorSystem with Matchers with B
248248
val subject = Subject().asString
249249
try {
250250
// set some limits
251-
wskadmin.cli(Seq("limits", "set", subject, "--allowedKinds", "nodejs:14", "blackbox"))
251+
wskadmin.cli(Seq("limits", "set", subject, "--allowedKinds", "nodejs:20", "blackbox"))
252252
// check correctly set
253253
val lines = wskadmin.cli(Seq("limits", "get", subject)).stdout.linesIterator.toSeq
254254
lines should have size 1
255-
lines(0) should (be("allowedKinds = [u'nodejs:14', u'blackbox']") or be(
256-
"allowedKinds = ['nodejs:14', 'blackbox']"))
255+
lines(0) should (be("allowedKinds = [u'nodejs:20', u'blackbox']") or be(
256+
"allowedKinds = ['nodejs:20', 'blackbox']"))
257257
} finally {
258258
wskadmin.cli(Seq("limits", "delete", subject)).stdout should include("Limits deleted")
259259
}

‎tests/src/test/scala/org/apache/openwhisk/core/containerpool/docker/test/DockerContainerFactoryTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class DockerContainerFactoryTests
6868

6969
it should "set the docker run args based on ContainerArgsConfig" in {
7070

71-
val image = ExecManifest.runtimesManifest.manifests("nodejs:14").image
71+
val image = ExecManifest.runtimesManifest.manifests("nodejs:20").image
7272

7373
implicit val tid = TransactionId.testing
7474
val dockerApiStub = mock[DockerApiWithFileAccess]

‎tests/src/test/scala/org/apache/openwhisk/core/controller/test/EntitlementProviderTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class EntitlementProviderTests extends ControllerTestCommon with ScalaFutures {
5353
val adminUser = WhiskAuthHelpers.newIdentity(Subject("admin"))
5454
val guestUser = WhiskAuthHelpers.newIdentity(Subject("anonym"))
5555

56-
val allowedKinds = Set("nodejs:14", "python")
56+
val allowedKinds = Set("nodejs:20", "python")
5757
val disallowedKinds = Set("golang", "blackbox")
5858

5959
def getExec(kind: String): Exec = {

‎tests/src/test/scala/org/apache/openwhisk/core/controller/test/KindRestrictorTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class KindRestrictorTests extends FlatSpec with Matchers with StreamLogging {
3939

4040
behavior of "Kind Restrictor"
4141

42-
val allowedKinds = Set("nodejs:14", "python")
42+
val allowedKinds = Set("nodejs:20", "python")
4343
val disallowedKinds = Set("golang", "blackbox")
4444
val allKinds = allowedKinds ++ disallowedKinds
4545

‎tests/src/test/scala/org/apache/openwhisk/core/database/ArtifactWithFileStorageActivationStoreTests.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class ArtifactWithFileStorageActivationStoreTests()
152152
response = response,
153153
logs = logs,
154154
duration = Some(101L),
155-
annotations = Parameters("kind", "nodejs:14") ++ Parameters(
155+
annotations = Parameters("kind", "nodejs:20") ++ Parameters(
156156
"limits",
157157
ActionLimits(TimeLimit(60.second), MemoryLimit(256.MB), LogLimit(10.MB)).toJson) ++
158158
Parameters("waitTime", 16.toJson) ++
@@ -203,7 +203,7 @@ class ArtifactWithFileStorageActivationStoreTests()
203203
response = response,
204204
logs = logs,
205205
duration = Some(101L),
206-
annotations = Parameters("kind", "nodejs:14") ++ Parameters(
206+
annotations = Parameters("kind", "nodejs:20") ++ Parameters(
207207
"limits",
208208
ActionLimits(TimeLimit(60.second), MemoryLimit(256.MB), LogLimit(10.MB)).toJson) ++
209209
Parameters("waitTime", 16.toJson) ++
@@ -315,7 +315,7 @@ class ArtifactWithFileStorageActivationStoreTests()
315315
response = response,
316316
logs = logs,
317317
duration = Some(101L),
318-
annotations = Parameters("kind", "nodejs:14") ++ Parameters(
318+
annotations = Parameters("kind", "nodejs:20") ++ Parameters(
319319
"limits",
320320
ActionLimits(TimeLimit(60.second), MemoryLimit(256.MB), LogLimit(10.MB)).toJson) ++
321321
Parameters("waitTime", 16.toJson) ++

‎tests/src/test/scala/org/apache/openwhisk/core/database/LimitsCommandTests.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class LimitsCommandTests extends FlatSpec with WhiskAdminCliTestBase {
5050
"--concurrentInvocations",
5151
"11",
5252
"--allowedKinds",
53-
"nodejs:14",
53+
"nodejs:20",
5454
"blackbox",
5555
"--storeActivations",
5656
"false",
@@ -61,7 +61,7 @@ class LimitsCommandTests extends FlatSpec with WhiskAdminCliTestBase {
6161
invocationsPerMinute = Some(3),
6262
firesPerMinute = Some(7),
6363
concurrentInvocations = Some(11),
64-
allowedKinds = Some(Set("nodejs:14", "blackbox")),
64+
allowedKinds = Some(Set("nodejs:20", "blackbox")),
6565
storeActivations = Some(false))
6666

6767
resultOk("limits", "set", "--invocationsPerMinute", "13", ns) shouldBe CommandMessages.limitsSuccessfullyUpdated(ns)
@@ -97,10 +97,10 @@ class LimitsCommandTests extends FlatSpec with WhiskAdminCliTestBase {
9797

9898
it should "update existing allowedKind limit" in {
9999
val ns = newNamespace()
100-
resultOk("limits", "set", "--allowedKinds", "nodejs:14", ns)
101-
resultOk("limits", "get", ns) shouldBe "allowedKinds = nodejs:14"
102-
resultOk("limits", "set", "--allowedKinds", "nodejs:14", "blackbox", "python", ns)
103-
resultOk("limits", "get", ns) shouldBe "allowedKinds = nodejs:14, blackbox, python"
100+
resultOk("limits", "set", "--allowedKinds", "nodejs:20", ns)
101+
resultOk("limits", "get", ns) shouldBe "allowedKinds = nodejs:20"
102+
resultOk("limits", "set", "--allowedKinds", "nodejs:20", "blackbox", "python", ns)
103+
resultOk("limits", "get", ns) shouldBe "allowedKinds = nodejs:20, blackbox, python"
104104

105105
//Delete
106106
resultOk("limits", "delete", ns) shouldBe CommandMessages.limitsDeleted

0 commit comments

Comments
 (0)