Skip to content

Commit 91e3f28

Browse files
authored
remove previously deprecated nodejs:10 and go:1.11 kinds (#5147)
1 parent a99b0a8 commit 91e3f28

File tree

7 files changed

+30
-53
lines changed

7 files changed

+30
-53
lines changed

ansible/files/runtimes.json

Lines changed: 15 additions & 30 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:10').",
6+
"Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:14').",
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,20 +14,6 @@
1414
],
1515
"runtimes": {
1616
"nodejs": [
17-
{
18-
"kind": "nodejs:10",
19-
"default": false,
20-
"image": {
21-
"prefix": "openwhisk",
22-
"name": "action-nodejs-v10",
23-
"tag": "nightly"
24-
},
25-
"deprecated": true,
26-
"attached": {
27-
"attachmentName": "codefile",
28-
"attachmentType": "text/plain"
29-
}
30-
},
3117
{
3218
"kind": "nodejs:12",
3319
"default": false,
@@ -128,6 +114,20 @@
128114
"attachmentName": "codefile",
129115
"attachmentType": "text/plain"
130116
}
117+
},
118+
{
119+
"kind": "swift:5.4",
120+
"default": false,
121+
"image": {
122+
"prefix": "openwhisk",
123+
"name": "action-swift-v5.4",
124+
"tag": "nightly"
125+
},
126+
"deprecated": false,
127+
"attached": {
128+
"attachmentName": "codefile",
129+
"attachmentType": "text/plain"
130+
}
131131
}
132132
],
133133
"java": [
@@ -208,20 +208,6 @@
208208
}
209209
],
210210
"go": [
211-
{
212-
"kind": "go:1.11",
213-
"default": false,
214-
"deprecated": true,
215-
"attached": {
216-
"attachmentName": "codefile",
217-
"attachmentType": "text/plain"
218-
},
219-
"image": {
220-
"prefix": "openwhisk",
221-
"name": "action-golang-v1.11",
222-
"tag": "nightly"
223-
}
224-
},
225211
{
226212
"kind": "go:1.15",
227213
"default": true,
@@ -301,7 +287,6 @@
301287
}
302288
}
303289
]
304-
305290
},
306291
"blackboxes": [
307292
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,7 +1996,6 @@
19961996
"blackbox",
19971997
"java:8",
19981998
"java:default",
1999-
"nodejs:10",
20001999
"nodejs:12",
20012000
"nodejs:14",
20022001
"nodejs:default",
@@ -2008,13 +2007,13 @@
20082007
"python:default",
20092008
"ruby:2.5",
20102009
"ruby:default",
2011-
"go:1.11",
20122010
"go:1.15",
20132011
"go:default",
20142012
"sequence",
20152013
"swift:4.2",
20162014
"swift:5.1",
20172015
"swift:5.3",
2016+
"swift:5.4",
20182017
"swift:default",
20192018
"dotnet:2.2",
20202019
"dotnet:3.1",

docs/actions-go.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
# Creating and Invoking Go Actions
2323

24-
The `action-golang-v1.11` runtime can execute actions written in the Go programming language in OpenWhisk, either as precompiled binary or compiling sources on the fly.
24+
The `action-golang-v1.15` runtime can execute actions written in the Go programming language in OpenWhisk, either as precompiled binary or compiling sources on the fly.
2525

2626
## Entry Point
2727

@@ -68,7 +68,7 @@ You can also have multiple source files in an action, packages and vendor folder
6868

6969
## Deployment
7070

71-
The runtime `action-golang-v1.11` accepts:
71+
The runtime `action-golang-v1.15` accepts:
7272

7373
- executable binaries in Linux ELF executable compiled for the AMD64 architecture
7474
- zip files containing a binary executable named `exec` at the top level, again a Linux ELF executable compiled for the AMD64 architecture
@@ -113,7 +113,7 @@ When you send the sources, you will have to zip the content of the `src` folder,
113113
cd src
114114
zip -r ../hello.zip *
115115
cd ..
116-
wsk action create hellozip hello.zip --kind go:1.11
116+
wsk action create hellozip hello.zip --kind go:1.15
117117
```
118118

119119
Check the example [golang-main-package](https://github.com/apache/openwhisk-runtime-go/tree/master/examples/golang-main-package) and the associated `Makefile`.
@@ -166,28 +166,28 @@ If you need to use vendor folder in the main package, you need to create a direc
166166

167167
## Precompiling Go Sources Offline
168168

169-
Compiling sources on the image can take some time when the images is initialized. You can speed up precompiling the sources using the image `action-golang-v1.11` as an offline compiler. You need `docker` for doing that.
169+
Compiling sources on the image can take some time when the images is initialized. You can speed up precompiling the sources using the image `action-golang-v1.15` as an offline compiler. You need `docker` for doing that.
170170

171171
The images accepts a `-compile <main>` flag, and expects you provide sources in standard input. It will then compile them, emit the binary in standard output and errors in stderr. The output is always a zip file containing an executable.
172172

173173
If you have a single source maybe in file `main.go`, with a function named `Main` just do this:
174174

175-
`docker run openwhisk/action-golang-v1.11 -compile main <main.go >main.zip`
175+
`docker run openwhisk/action-golang-v1.15 -compile main <main.go >main.zip`
176176

177177
If you have multiple sources in current directory, even with a subfolder with sources, you can compile it all with:
178178

179179
```
180180
cd src
181181
zip -r ../src.zip *
182182
cd ..
183-
docker -i run openwhisk/action-golang-v1.11 -compile main <src.zip >exec.zip
183+
docker -i run openwhisk/action-golang-v1.15 -compile main <src.zip >exec.zip
184184
```
185185

186186
Note that the output is always a zip file in Linux AMD64 format so the executable can be run only inside a Docker Linux container.
187187

188188
Here a `Makefile` is helpful. Check the [examples](https://github.com/apache/openwhisk-runtime-go/tree/master/examples) for a collection of tested Makefiles. The generated executable is suitable to be deployed in OpenWhisk, so you can do:
189189

190-
`wsk action create my-action exec.zip --kind go:1.11`
190+
`wsk action create my-action exec.zip --kind go:1.15`
191191

192192
You can also use just the `openwhisk/actionloop` as runtime, it is smaller.
193193

docs/actions-nodejs.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ and demonstrate how to bundle multiple JavaScript files and third party dependen
4343

4444
The CLI automatically infers the type of the action by using the source file extension.
4545
For `.js` source files, the action runs by using a Node.js runtime. You may specify
46-
the Node.js runtime to use by explicitly specifying the parameter `--kind nodejs:14`, `--kind nodejs:12`, or `--kind nodejs:10`.
46+
the Node.js runtime to use by explicitly specifying the parameter `--kind nodejs:14`, or `--kind nodejs:12`.
4747

4848

4949
## Creating asynchronous actions
@@ -459,16 +459,9 @@ wsk action invoke my-action --result --param lines "[\"and now\", \"for somethin
459459

460460
## Reference
461461

462-
JavaScript actions can be executed in Node.js version 10, 12 or 14.
462+
JavaScript actions can be executed in Node.js version 12 or 14.
463463
Currently actions are executed by default in a Node.js version 14 environment.
464464

465-
### Node.js version 10 environment
466-
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.
467-
468-
The following packages are pre-installed in the Node.js version 10 environment:
469-
470-
- [openwhisk](https://www.npmjs.com/package/openwhisk) - JavaScript client library for the OpenWhisk platform. Provides a wrapper around the OpenWhisk APIs.
471-
472465
### Node.js version 12 environment
473466
The Node.js version 12 environment is used if the `--kind` flag is explicitly specified with a value of 'nodejs:12' when creating or updating an Action.
474467

docs/concurrency.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Concurrent activation processing within the same action container can be enabled
2929

3030
* enable the akka http client at invoker config
3131
* e.g. CONFIG_whisk_containerPool_akkaClient=true
32-
* use a kind that supports concurrency (currently only `nodejs:14`, `nodejs:12`, and `nodejs:10`)
32+
* use a kind that supports concurrency (currently only `nodejs:14`, and `nodejs:12`)
3333
* enable concurrency at runtime container env (nodejs container only allows concurrency when started with an env var __OW_ALLOW_CONCURRENT=true)
3434
* e.g. CONFIG_whisk_containerFactory_containerArgs_extraArgs_env_0="__OW_ALLOW_CONCURRENT=true"
3535
* disable log collection at invoker

tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ class SchemaTests extends FlatSpec with BeforeAndAfter with ExecHelpers with Mat
493493
it should "initialize exec manifest" in {
494494
val runtimes = ExecManifest.runtimesManifest
495495
val kind = runtimes.resolveDefaultRuntime("nodejs:default").get.kind
496-
Some(kind) should contain oneOf ("nodejs:10", "nodejs:12", "nodejs:14")
496+
Some(kind) should contain oneOf ("nodejs:12", "nodejs:14")
497497
}
498498

499499
it should "properly deserialize and reserialize JSON" in {

tests/src/test/scala/org/apache/openwhisk/core/invoker/test/ContainerMessageConsumerTests.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class ContainerMessageConsumerTests
154154
500,
155155
sendAckToScheduler(producer))
156156

157-
val exec = CodeExecAsString(RuntimeManifest("nodejs:10", ImageName("testImage")), "testCode", None)
157+
val exec = CodeExecAsString(RuntimeManifest("nodejs:14", ImageName("testImage")), "testCode", None)
158158
val action =
159159
WhiskAction(EntityPath("testns"), EntityName("testAction"), exec, limits = ActionLimits(TimeLimit(1.minute)))
160160
put(entityStore, action)
@@ -209,7 +209,7 @@ class ContainerMessageConsumerTests
209209
500,
210210
sendAckToScheduler(ackConsumer.getProducer()))
211211

212-
val exec = CodeExecAsString(RuntimeManifest("nodejs:10", ImageName("testImage")), "testCode", None)
212+
val exec = CodeExecAsString(RuntimeManifest("nodejs:14", ImageName("testImage")), "testCode", None)
213213
val whiskAction =
214214
WhiskAction(EntityPath("testns"), EntityName("testAction2"), exec, limits = ActionLimits(TimeLimit(1.minute)))
215215
val execMetadata =
@@ -285,7 +285,7 @@ class ContainerMessageConsumerTests
285285
500,
286286
sendAckToScheduler(producer))
287287

288-
val exec = CodeExecAsString(RuntimeManifest("nodejs:10", ImageName("testImage")), "testCode", None)
288+
val exec = CodeExecAsString(RuntimeManifest("nodejs:14", ImageName("testImage")), "testCode", None)
289289
val action =
290290
WhiskAction(
291291
WarmUp.warmUpAction.namespace.toPath,

0 commit comments

Comments
 (0)