Merge branch 'master' into master

apache · Oct 22, 2020 · 75c6599 · 75c6599
2 parents f70d6b0 + f58729b
commit 75c6599
Show file tree

Hide file tree

Showing 24 changed files with 101 additions and 289 deletions.
diff --git a/README.md b/README.md
@@ -138,7 +138,7 @@ Additional more detailed instructions:
 deployment and management of applications on Kubernetes clusters.
 The OpenWhisk Helm chart requires the Helm 3.
 
-Our automated testing currently uses Helm v3.2.0
+Our automated testing currently uses Helm v3.2.4
 
 Follow the Helm [install instructions](https://github.com/kubernetes/helm)
 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
 You can use a different name and/or namespace simply by changing the commands
 used below.
 
+**NOTE:** Clone the repository https://github.com/apache/openwhisk-deploy-kube.git and use to Helm chart available under the `helm/openwhisk` folder.
+
 Deployment can be done by using the following single command:
 ```shell
 helm install owdev ./helm/openwhisk -n openwhisk --create-namespace -f mycluster.yaml
 ```
 
+**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`.
+
 Deploying to OKD/OpenShift uses the command sequence:
 ```shell
 helm template owdev ./helm/openwhisk -n openwhisk -f mycluster.yaml > owdev.yaml
@@ -260,9 +264,11 @@ by simply doing `oc delete -f owdev.yaml`
 
 You can use the command `helm status owdev -n openwhisk` to get a summary
 of the various Kubernetes artifacts that make up your OpenWhisk
-deployment. Once the `install-packages` Pod is in the `Completed` state,
+deployment. Once the pod name containing the word `install-packages` is in the `Completed` state,
 your OpenWhisk deployment is ready to be used.
 
+**NOTE:** You can check the status of the pod by running the following command `kubectl get pods -n openwhisk --watch`.
+
 ## Configure the wsk CLI
 
 Configure the OpenWhisk CLI, wsk, by setting the auth and apihost
@@ -366,6 +372,8 @@ launch the tests:
  -Dwhisk.auth=$WHISK_AUTH -Dwhisk.server=https://$WHISK_SERVER -Dopenwhisk.home=`pwd`
 ```
 
+**NOTE:** You need to install JDK 8 in order to run these tests.
+
 ### Deploying a locally built docker image.
 
 If you are using Kubernetes in Docker, it is
@@ -435,4 +443,3 @@ If your OpenWhisk deployment is not working, check our
 Report bugs, ask questions and request features [here on GitHub](../../issues).
 
 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).
-
diff --git a/docs/configurationChoices.md b/docs/configurationChoices.md
@@ -43,7 +43,7 @@ components is not currently supported:
 - couchdb. For production deployments of OpenWhisk on Kubernetes, we strongly recomend running
  CouchDB externally to OpenWhisk as described below. An external CouchDB instance enables
  better management of the database and decouples its lifecycle from that of the OpenWhisk deployment.
-- The event providers: alarmprovider, cloudantprovider, and kafkaprovider.
+- The event providers: alarmprovider and kafkaprovider.
 
 ### Using an external database
 
@@ -179,8 +179,8 @@ k8s:
 
 ### Selectively Deploying Event Providers
 
-The default settings of the Helm chart will deploy OpenWhisk's alarm,
-cloudant, and kafka event providers. If you want to disable the
+The default settings of the Helm chart will deploy OpenWhisk's alarm
+and kafka event providers. If you want to disable the
 deployment of one or more event providers, you can add
 a stanza to your `mycluster.yaml` for example:
 ```yaml

diff --git a/docs/k8s-kind.md b/docs/k8s-kind.md
@@ -36,7 +36,7 @@ operate a default cluster with two virtual worker nodes.
 
 Download the latest stable release of `kind` for your platform from
 https://github.com/kubernetes-sigs/kind/releases. Our TravisCI testing
-currently uses kind v0.8.1 on an ubuntu 18.04 host.
+currently uses kind v0.9.0 on an ubuntu 18.04 host.
 
 ### Creating the Kubernetes Cluster
 
@@ -66,11 +66,6 @@ Now create your cluster with the command:
 kind create cluster --config kind-cluster.yaml
 ```
 
-Next, configure `kubectl` by executing
-```shell
-KUBECONFIG="$(kind get kubeconfig-path)"
-```
-
 Then label the two worker nodes so that one is reserved for the invoker
 and the other will be used to run the rest of the OpenWhisk system.
 ```shell

diff --git a/docs/private-docker-registry.md b/docs/private-docker-registry.md
@@ -34,7 +34,6 @@ By default, helm charts currently use docker hub to download images to deploy Op
  - busybox
  - openwhisk/alarmprovider
  - openwhisk/kafkaprovider
- - openwhisk/cloudantprovider
 
 - Add details of your docker registry information in mycluster.yml.
 

diff --git a/helm/openwhisk/Chart.yaml b/helm/openwhisk/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 type: application
 name: openwhisk
-version: 0.2.4
+version: 0.2.7
 home: https://openwhisk.apache.org
 description: Apache OpenWhisk is an open source serverless cloud platform
 icon: https://raw.githubusercontent.com/apache/openwhisk/682eb5b62ee6ba8017ab54226c2ace3637f4f1ec/docs/images/whisk_icon_full-color_with_tm_64x64-300dpi.png
@@ -28,4 +28,4 @@ keywords:
 maintainers:
  - name: Apache OpenWhisk Community
  email: [email protected]
-kubeVersion: ">=v1.10.0-r0"
+kubeVersion: ">=v1.14.0-r0"
diff --git a/helm/openwhisk/README.md b/helm/openwhisk/README.md
@@ -57,7 +57,7 @@ The chart requires one or more Kubernetes worker nodes to be designated to be us
 
 ## Prerequisites
 
-* Kubernetes 1.10 - 1.16.*
+* Kubernetes 1.14 - 1.18.*
 
 ### Image Policy Requirements
 

diff --git a/helm/openwhisk/configMapFiles/installPackages/myTask.sh b/helm/openwhisk/configMapFiles/installPackages/myTask.sh
@@ -101,22 +101,7 @@ if [ "$OW_INSTALL_ALARM_PROVIDER" == "yes" ]; then
 
  pushd /openwhisk-package-alarms
  git checkout $OW_GIT_TAG_OPENWHISK_PACKAGE_ALARMS
- ./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $PROVIDER_DB_URL $ALARM_DB_PREFIX $WHISK_API_HOST_URL || exit 1
- popd
-fi
-
-
-#####
-# Install the catalog for the Cloudant provider
-#####
-
-if [ "$OW_INSTALL_CLOUDANT_PROVIDER" == "yes" ]; then
- cd /
- git clone https://github.com/apache/openwhisk-package-cloudant.git
-
- pushd /openwhisk-package-cloudant
- git checkout $OW_GIT_TAG_OPENWHISK_PACKAGE_CLOUDANT
- ./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $PROVIDER_DB_URL $CLOUDANT_DB_PREFIX $WHISK_API_HOST_URL || exit 1
+ ./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $WHISK_API_HOST_URL worker0 $PROVIDER_DB_URL $ALARM_DB_PREFIX || exit 1
  popd
 fi
 

diff --git a/helm/openwhisk/configMapFiles/tests/packageChecker/myTask.sh b/helm/openwhisk/configMapFiles/tests/packageChecker/myTask.sh
@@ -61,9 +61,6 @@ packageListingCheck "websocket"
 if [ "$OW_INSTALL_ALARM_PROVIDER" == "yes" ]; then
  packageListingCheck "alarms"
 fi
-if [ "$OW_INSTALL_CLOUDANT_PROVIDER" == "yes" ]; then
- packageListingCheck "cloudant"
-fi
 if [ "$OW_INSTALL_KAFKA_PROVIDER" == "yes" ]; then
  packageListingCheck "messaging"
 fi

diff --git a/helm/openwhisk/runtimes-minimal-travis.json b/helm/openwhisk/runtimes-minimal-travis.json
@@ -2,23 +2,13 @@
 {
  "runtimes": {
  "nodejs": [
- {
- "kind": "nodejs:6",
- "default": false,
- "image": {
- "prefix": "openwhisk",
- "name": "nodejs6action",
- "tag": "1.14.0-incubating"
- },
- "deprecated": false
- },
  {
  "kind": "nodejs:10",
  "default": true,
  "image": {
  "prefix": "openwhisk",
  "name": "action-nodejs-v10",
- "tag": "1.14.0-incubating"
+ "tag": "1.16.0"
  },
  "deprecated": false,
  "attached": {
@@ -33,7 +23,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "python3action",
- "tag": "1.13.0-incubating"
+ "tag": "1.15.0"
  },
  "deprecated": false
  }
@@ -45,7 +35,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-swift-v4.2",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "deprecated": false,
  "attached": {

diff --git a/helm/openwhisk/runtimes.json b/helm/openwhisk/runtimes.json
@@ -1,41 +1,13 @@
 {
  "runtimes": {
  "nodejs": [
- {
- "kind": "nodejs:6",
- "default": false,
- "image": {
- "prefix": "openwhisk",
- "name": "nodejs6action",
- "tag": "1.14.0-incubating"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "nodejs:8",
- "default": false,
- "image": {
- "prefix": "openwhisk",
- "name": "action-nodejs-v8",
- "tag": "1.15.0"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
  {
  "kind": "nodejs:10",
  "default": true,
  "image": {
  "prefix": "openwhisk",
  "name": "action-nodejs-v10",
- "tag": "1.15.0"
+ "tag": "1.16.0"
  },
  "deprecated": false,
  "attached": {
@@ -55,7 +27,21 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-nodejs-v12",
- "tag": "1.15.0"
+ "tag": "1.16.0"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "nodejs:14",
+ "default": false,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-nodejs-v14",
+ "tag": "1.16.0"
  },
  "deprecated": false,
  "attached": {
@@ -85,7 +71,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "python3action",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "deprecated": false,
  "attached": {
@@ -101,7 +87,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-swift-v4.2",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "deprecated": false,
  "attached": {
@@ -115,7 +101,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-swift-v5.1",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "deprecated": false,
  "attached": {
@@ -131,7 +117,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "java8action",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "deprecated": false,
  "attached": {
@@ -149,7 +135,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-php-v7.3",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "attached": {
  "attachmentName": "codefile",
@@ -163,7 +149,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-php-v7.4",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "attached": {
  "attachmentName": "codefile",
@@ -183,15 +169,15 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-ruby-v2.5",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  }
  }
  ],
  "go": [
  {
  "kind": "go:1.11",
- "default": true,
- "deprecated": false,
+ "default": false,
+ "deprecated": true,
  "attached": {
  "attachmentName": "codefile",
  "attachmentType": "text/plain"
@@ -201,6 +187,20 @@
  "name": "action-golang-v1.11",
  "tag": "1.15.0"
  }
+ },
+ {
+ "kind": "go:1.15",
+ "default": true,
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ },
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-golang-v1.15",
+ "tag": "1.16.0"
+ }
  }
  ],
  "rust": [
@@ -215,7 +215,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-rust-v1.34",
- "tag": "1.0.0"
+ "tag": "1.1.0"
  }
  }
  ],
@@ -228,7 +228,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-dotnet-v2.2",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "attached": {
  "attachmentName": "codefile",
@@ -243,7 +243,7 @@
  "image": {
  "prefix": "openwhisk",
  "name": "action-dotnet-v3.1",
- "tag": "1.14.0"
+ "tag": "1.15.0"
  },
  "attached": {
  "attachmentName": "codefile",