Skip to content

Commit 75c6599

Browse files
mludsmluds
authored
Merge branch 'master' into master
2 parents f70d6b0 + f58729b commit 75c6599

24 files changed

+101
-289
lines changed

‎README.md‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Additional more detailed instructions:
138138
deployment and management of applications on Kubernetes clusters.
139139
The OpenWhisk Helm chart requires the Helm 3.
140140

141-
Our automated testing currently uses Helm v3.2.0
141+
Our automated testing currently uses Helm v3.2.4
142142

143143
Follow the Helm [install instructions](https://github.com/kubernetes/helm)
144144
for your platform to install Helm v3.0.1 or newer.
@@ -243,11 +243,15 @@ For simplicity, in this README, we have used `owdev` as the release name and
243243
You can use a different name and/or namespace simply by changing the commands
244244
used below.
245245

246+
**NOTE:** Clone the repository https://github.com/apache/openwhisk-deploy-kube.git and use to Helm chart available under the `helm/openwhisk` folder.
247+
246248
Deployment can be done by using the following single command:
247249
```shell
248250
helm install owdev ./helm/openwhisk -n openwhisk --create-namespace -f mycluster.yaml
249251
```
250252

253+
**NOTE:** The above command will only work for Helm v3.2.0 or higher versions. Verfiy your local Helm version with the command `helm version`.
254+
251255
Deploying to OKD/OpenShift uses the command sequence:
252256
```shell
253257
helm template owdev ./helm/openwhisk -n openwhisk -f mycluster.yaml > owdev.yaml
@@ -260,9 +264,11 @@ by simply doing `oc delete -f owdev.yaml`
260264

261265
You can use the command `helm status owdev -n openwhisk` to get a summary
262266
of the various Kubernetes artifacts that make up your OpenWhisk
263-
deployment. Once the `install-packages` Pod is in the `Completed` state,
267+
deployment. Once the pod name containing the word `install-packages` is in the `Completed` state,
264268
your OpenWhisk deployment is ready to be used.
265269

270+
**NOTE:** You can check the status of the pod by running the following command `kubectl get pods -n openwhisk --watch`.
271+
266272
## Configure the wsk CLI
267273

268274
Configure the OpenWhisk CLI, wsk, by setting the auth and apihost
@@ -366,6 +372,8 @@ launch the tests:
366372
-Dwhisk.auth=$WHISK_AUTH -Dwhisk.server=https://$WHISK_SERVER -Dopenwhisk.home=`pwd`
367373
```
368374

375+
**NOTE:** You need to install JDK 8 in order to run these tests.
376+
369377
### Deploying a locally built docker image.
370378

371379
If you are using Kubernetes in Docker, it is
@@ -435,4 +443,3 @@ If your OpenWhisk deployment is not working, check our
435443
Report bugs, ask questions and request features [here on GitHub](../../issues).
436444

437445
You can also join our slack channel and chat with developers. To get access to our slack channel, request an invite [here](http://slack.openwhisk.org).
438-

‎docs/configurationChoices.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ components is not currently supported:
4343
- couchdb. For production deployments of OpenWhisk on Kubernetes, we strongly recomend running
4444
CouchDB externally to OpenWhisk as described below. An external CouchDB instance enables
4545
better management of the database and decouples its lifecycle from that of the OpenWhisk deployment.
46-
- The event providers: alarmprovider, cloudantprovider, and kafkaprovider.
46+
- The event providers: alarmprovider and kafkaprovider.
4747
4848
### Using an external database
4949
@@ -179,8 +179,8 @@ k8s:
179179

180180
### Selectively Deploying Event Providers
181181

182-
The default settings of the Helm chart will deploy OpenWhisk's alarm,
183-
cloudant, and kafka event providers. If you want to disable the
182+
The default settings of the Helm chart will deploy OpenWhisk's alarm
183+
and kafka event providers. If you want to disable the
184184
deployment of one or more event providers, you can add
185185
a stanza to your `mycluster.yaml` for example:
186186
```yaml

‎docs/k8s-kind.md‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ operate a default cluster with two virtual worker nodes.
3636

3737
Download the latest stable release of `kind` for your platform from
3838
https://github.com/kubernetes-sigs/kind/releases. Our TravisCI testing
39-
currently uses kind v0.8.1 on an ubuntu 18.04 host.
39+
currently uses kind v0.9.0 on an ubuntu 18.04 host.
4040

4141
### Creating the Kubernetes Cluster
4242

@@ -66,11 +66,6 @@ Now create your cluster with the command:
6666
kind create cluster --config kind-cluster.yaml
6767
```
6868

69-
Next, configure `kubectl` by executing
70-
```shell
71-
KUBECONFIG="$(kind get kubeconfig-path)"
72-
```
73-
7469
Then label the two worker nodes so that one is reserved for the invoker
7570
and the other will be used to run the rest of the OpenWhisk system.
7671
```shell

‎docs/private-docker-registry.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ By default, helm charts currently use docker hub to download images to deploy Op
3434
- busybox
3535
- openwhisk/alarmprovider
3636
- openwhisk/kafkaprovider
37-
- openwhisk/cloudantprovider
3837

3938
- Add details of your docker registry information in mycluster.yml.
4039

‎helm/openwhisk/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
apiVersion: v2
1919
type: application
2020
name: openwhisk
21-
version: 0.2.4
21+
version: 0.2.7
2222
home: https://openwhisk.apache.org
2323
description: Apache OpenWhisk is an open source serverless cloud platform
2424
icon: https://raw.githubusercontent.com/apache/openwhisk/682eb5b62ee6ba8017ab54226c2ace3637f4f1ec/docs/images/whisk_icon_full-color_with_tm_64x64-300dpi.png
@@ -28,4 +28,4 @@ keywords:
2828
maintainers:
2929
- name: Apache OpenWhisk Community
3030
email: [email protected]
31-
kubeVersion: ">=v1.10.0-r0"
31+
kubeVersion: ">=v1.14.0-r0"

‎helm/openwhisk/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The chart requires one or more Kubernetes worker nodes to be designated to be us
5757

5858
## Prerequisites
5959

60-
* Kubernetes 1.10 - 1.16.*
60+
* Kubernetes 1.14 - 1.18.*
6161

6262
### Image Policy Requirements
6363

‎helm/openwhisk/configMapFiles/installPackages/myTask.sh‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,7 @@ if [ "$OW_INSTALL_ALARM_PROVIDER" == "yes" ]; then
101101

102102
pushd /openwhisk-package-alarms
103103
git checkout $OW_GIT_TAG_OPENWHISK_PACKAGE_ALARMS
104-
./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $PROVIDER_DB_URL $ALARM_DB_PREFIX $WHISK_API_HOST_URL || exit 1
105-
popd
106-
fi
107-
108-
109-
#####
110-
# Install the catalog for the Cloudant provider
111-
#####
112-
113-
if [ "$OW_INSTALL_CLOUDANT_PROVIDER" == "yes" ]; then
114-
cd /
115-
git clone https://github.com/apache/openwhisk-package-cloudant.git
116-
117-
pushd /openwhisk-package-cloudant
118-
git checkout $OW_GIT_TAG_OPENWHISK_PACKAGE_CLOUDANT
119-
./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $PROVIDER_DB_URL $CLOUDANT_DB_PREFIX $WHISK_API_HOST_URL || exit 1
104+
./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $WHISK_API_HOST_URL worker0 $PROVIDER_DB_URL $ALARM_DB_PREFIX || exit 1
120105
popd
121106
fi
122107

‎helm/openwhisk/configMapFiles/tests/packageChecker/myTask.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ packageListingCheck "websocket"
6161
if [ "$OW_INSTALL_ALARM_PROVIDER" == "yes" ]; then
6262
packageListingCheck "alarms"
6363
fi
64-
if [ "$OW_INSTALL_CLOUDANT_PROVIDER" == "yes" ]; then
65-
packageListingCheck "cloudant"
66-
fi
6764
if [ "$OW_INSTALL_KAFKA_PROVIDER" == "yes" ]; then
6865
packageListingCheck "messaging"
6966
fi

‎helm/openwhisk/runtimes-minimal-travis.json‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,13 @@
22
{
33
"runtimes": {
44
"nodejs": [
5-
{
6-
"kind": "nodejs:6",
7-
"default": false,
8-
"image": {
9-
"prefix": "openwhisk",
10-
"name": "nodejs6action",
11-
"tag": "1.14.0-incubating"
12-
},
13-
"deprecated": false
14-
},
155
{
166
"kind": "nodejs:10",
177
"default": true,
188
"image": {
199
"prefix": "openwhisk",
2010
"name": "action-nodejs-v10",
21-
"tag": "1.14.0-incubating"
11+
"tag": "1.16.0"
2212
},
2313
"deprecated": false,
2414
"attached": {
@@ -33,7 +23,7 @@
3323
"image": {
3424
"prefix": "openwhisk",
3525
"name": "python3action",
36-
"tag": "1.13.0-incubating"
26+
"tag": "1.15.0"
3727
},
3828
"deprecated": false
3929
}
@@ -45,7 +35,7 @@
4535
"image": {
4636
"prefix": "openwhisk",
4737
"name": "action-swift-v4.2",
48-
"tag": "1.14.0"
38+
"tag": "1.15.0"
4939
},
5040
"deprecated": false,
5141
"attached": {

‎helm/openwhisk/runtimes.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,13 @@
11
{
22
"runtimes": {
33
"nodejs": [
4-
{
5-
"kind": "nodejs:6",
6-
"default": false,
7-
"image": {
8-
"prefix": "openwhisk",
9-
"name": "nodejs6action",
10-
"tag": "1.14.0-incubating"
11-
},
12-
"deprecated": false,
13-
"attached": {
14-
"attachmentName": "codefile",
15-
"attachmentType": "text/plain"
16-
}
17-
},
18-
{
19-
"kind": "nodejs:8",
20-
"default": false,
21-
"image": {
22-
"prefix": "openwhisk",
23-
"name": "action-nodejs-v8",
24-
"tag": "1.15.0"
25-
},
26-
"deprecated": false,
27-
"attached": {
28-
"attachmentName": "codefile",
29-
"attachmentType": "text/plain"
30-
}
31-
},
324
{
335
"kind": "nodejs:10",
346
"default": true,
357
"image": {
368
"prefix": "openwhisk",
379
"name": "action-nodejs-v10",
38-
"tag": "1.15.0"
10+
"tag": "1.16.0"
3911
},
4012
"deprecated": false,
4113
"attached": {
@@ -55,7 +27,21 @@
5527
"image": {
5628
"prefix": "openwhisk",
5729
"name": "action-nodejs-v12",
58-
"tag": "1.15.0"
30+
"tag": "1.16.0"
31+
},
32+
"deprecated": false,
33+
"attached": {
34+
"attachmentName": "codefile",
35+
"attachmentType": "text/plain"
36+
}
37+
},
38+
{
39+
"kind": "nodejs:14",
40+
"default": false,
41+
"image": {
42+
"prefix": "openwhisk",
43+
"name": "action-nodejs-v14",
44+
"tag": "1.16.0"
5945
},
6046
"deprecated": false,
6147
"attached": {
@@ -85,7 +71,7 @@
8571
"image": {
8672
"prefix": "openwhisk",
8773
"name": "python3action",
88-
"tag": "1.14.0"
74+
"tag": "1.15.0"
8975
},
9076
"deprecated": false,
9177
"attached": {
@@ -101,7 +87,7 @@
10187
"image": {
10288
"prefix": "openwhisk",
10389
"name": "action-swift-v4.2",
104-
"tag": "1.14.0"
90+
"tag": "1.15.0"
10591
},
10692
"deprecated": false,
10793
"attached": {
@@ -115,7 +101,7 @@
115101
"image": {
116102
"prefix": "openwhisk",
117103
"name": "action-swift-v5.1",
118-
"tag": "1.14.0"
104+
"tag": "1.15.0"
119105
},
120106
"deprecated": false,
121107
"attached": {
@@ -131,7 +117,7 @@
131117
"image": {
132118
"prefix": "openwhisk",
133119
"name": "java8action",
134-
"tag": "1.14.0"
120+
"tag": "1.15.0"
135121
},
136122
"deprecated": false,
137123
"attached": {
@@ -149,7 +135,7 @@
149135
"image": {
150136
"prefix": "openwhisk",
151137
"name": "action-php-v7.3",
152-
"tag": "1.14.0"
138+
"tag": "1.15.0"
153139
},
154140
"attached": {
155141
"attachmentName": "codefile",
@@ -163,7 +149,7 @@
163149
"image": {
164150
"prefix": "openwhisk",
165151
"name": "action-php-v7.4",
166-
"tag": "1.14.0"
152+
"tag": "1.15.0"
167153
},
168154
"attached": {
169155
"attachmentName": "codefile",
@@ -183,15 +169,15 @@
183169
"image": {
184170
"prefix": "openwhisk",
185171
"name": "action-ruby-v2.5",
186-
"tag": "1.14.0"
172+
"tag": "1.15.0"
187173
}
188174
}
189175
],
190176
"go": [
191177
{
192178
"kind": "go:1.11",
193-
"default": true,
194-
"deprecated": false,
179+
"default": false,
180+
"deprecated": true,
195181
"attached": {
196182
"attachmentName": "codefile",
197183
"attachmentType": "text/plain"
@@ -201,6 +187,20 @@
201187
"name": "action-golang-v1.11",
202188
"tag": "1.15.0"
203189
}
190+
},
191+
{
192+
"kind": "go:1.15",
193+
"default": true,
194+
"deprecated": false,
195+
"attached": {
196+
"attachmentName": "codefile",
197+
"attachmentType": "text/plain"
198+
},
199+
"image": {
200+
"prefix": "openwhisk",
201+
"name": "action-golang-v1.15",
202+
"tag": "1.16.0"
203+
}
204204
}
205205
],
206206
"rust": [
@@ -215,7 +215,7 @@
215215
"image": {
216216
"prefix": "openwhisk",
217217
"name": "action-rust-v1.34",
218-
"tag": "1.0.0"
218+
"tag": "1.1.0"
219219
}
220220
}
221221
],
@@ -228,7 +228,7 @@
228228
"image": {
229229
"prefix": "openwhisk",
230230
"name": "action-dotnet-v2.2",
231-
"tag": "1.14.0"
231+
"tag": "1.15.0"
232232
},
233233
"attached": {
234234
"attachmentName": "codefile",
@@ -243,7 +243,7 @@
243243
"image": {
244244
"prefix": "openwhisk",
245245
"name": "action-dotnet-v3.1",
246-
"tag": "1.14.0"
246+
"tag": "1.15.0"
247247
},
248248
"attached": {
249249
"attachmentName": "codefile",

0 commit comments

Comments
 (0)