[openwhisk] branch master updated: Remove duplicate `actions list` in `wsk` command (#4751)
This is an automated email from the ASF dual-hosted git repository. dgrove pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk.git The following commit(s) were added to refs/heads/master by this push: new f65efdf Remove duplicate `actions list` in `wsk` command (#4751) f65efdf is described below commit f65efdf98ca4ac50dc390806b4c0e7ceb72f042b Author: Marc Abramowitz AuthorDate: Fri Nov 22 15:41:12 2019 -0800 Remove duplicate `actions list` in `wsk` command (#4751) --- docs/actions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/actions.md b/docs/actions.md index 735d39d..c887e77 100644 --- a/docs/actions.md +++ b/docs/actions.md @@ -624,7 +624,7 @@ Notice that the list is now sorted alphabetically by namespace, then package nam As you write more actions, this list gets longer and it can be helpful to group related actions into [packages](packages.md). To filter your list of actions to just those within a specific package, you can use: ``` -wsk action list action list /whisk.system/utils +wsk action list /whisk.system/utils ``` ``` actions
[openwhisk-runtime-dotnet] branch master updated: Dotnet 3.0 (#20)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-dotnet.git
The following commit(s) were added to refs/heads/master by this push:
new 6ab68a7 Dotnet 3.0 (#20)
6ab68a7 is described below
commit 6ab68a75e3554cc0a2c6f96836b0c3961abcc33f
Author: Shawn Black
AuthorDate: Fri Nov 22 10:52:11 2019 -0600
Dotnet 3.0 (#20)
* .NET Core 3.0 support
* Updated .NET Core 2.2 project references
+ Updated .NET Core 2.2 Dockerfile to reference latest MS images
+ Migrated Quick Starts to individual projects
+ Moved shared test code to shared folder for reducing duplications
* .NET Core 2.2 quickstart update for JSON reference
* Travis updates Updating to xenial; dotnet sdk 3.0 install
* CHANGELOG Updates
---
.travis.yml| 4 +-
README.md | 154 +
core/dotnet2.2/CHANGELOG.md| 2 +-
core/dotnet2.2/Dockerfile | 6 +-
README.md => core/dotnet2.2/QUICKSTART.md | 55 +++---
.../Apache.OpenWhisk.Runtime.Common.csproj | 2 +-
.../Apache.OpenWhisk.Runtime.Dotnet.Minimal.csproj | 14 +-
core/{dotnet2.2 => dotnet3.0}/CHANGELOG.md | 4 +-
core/{dotnet2.2 => dotnet3.0}/Dockerfile | 6 +-
README.md => core/dotnet3.0/QUICKSTART.md | 67 +---
.../Nuller.cs => core/dotnet3.0/build.gradle | 13 +-
.../Apache.OpenWhisk.Runtime.Common.csproj | 4 +-
.../HttpResponseExtension.cs | 22 ++-
.../proxy/Apache.OpenWhisk.Runtime.Common/Init.cs | 178 +++
.../proxy/Apache.OpenWhisk.Runtime.Common/Run.cs | 109
.../Apache.OpenWhisk.Runtime.Common/Startup.cs | 69
.../Apache.OpenWhisk.Runtime.Dotnet.Minimal.csproj | 5 +-
.../Program.cs | 26 ++-
.../Nuller.cs => core/dotnet3.0/proxy/build.gradle | 19 +--
.../proxy/gradle/wrapper/gradle-wrapper.jar| Bin 0 -> 54329 bytes
.../gradle/wrapper/gradle-wrapper.properties} | 14 +-
core/dotnet3.0/proxy/gradlew | 188 +
core/dotnet3.0/proxy/gradlew.bat | 100 +++
.../dotnet3.0/proxy/openwhisk-runtime-dotnet.sln | 16 +-
settings.gradle| 6 +-
tests/build.gradle | 3 +-
.../Apache.OpenWhisk.Tests.Dotnet.csproj | 5 +
tests/{dotnet => dotnet2.2}/build.gradle | 2 +-
.../openwhisk-tests-dotnet.sln | 0
.../Apache.OpenWhisk.Tests.Dotnet.csproj | 9 +-
tests/{dotnet => dotnet3.0}/build.gradle | 7 +-
.../openwhisk-tests-dotnet.sln | 10 +-
.../AltEcho.cs | 0
.../Echo.cs| 0
.../Environment.cs | 0
.../Error.cs | 9 +-
.../Exception.cs | 0
.../NonEmptyConstructor.cs | 0
.../Nuller.cs | 0
.../Unicode.cs | 0
...s.scala => DotNet2_2ActionContainerTests.scala} | 9 +-
...s.scala => DotNet3_0ActionContainerTests.scala} | 11 +-
tools/travis/build.sh | 6 +-
43 files changed, 857 insertions(+), 297 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c387cf7..bdc9c4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
#
sudo: required
-group: deprecated-2017Q3
+dist: xenial
language: scala
scala:
- 2.12.7
@@ -41,7 +41,7 @@ deploy:
all_branches: true
repo: apache/openwhisk-runtime-dotnet
- provider: script
- script: "./tools/travis/publish.sh openwhisk 2.2 nightly"
+ script: "./tools/travis/publish.sh openwhisk 2.2 nightly &&
./tools/travis/publish.sh openwhisk 3.0 nightly"
on:
branch: master
repo: apache/openwhisk-runtime-dotnet
diff --git a/README.md b/README.md
index 6e87b8a..a529e1f 100644
--- a/README.md
+++ b/README.md
@@ -23,157 +23,15 @@
[](https://travis-ci.org/apache/openwhisk-runtime-dotnet)
## Changelogs
-- [.NET Core 2.2 CHANGELOG.md](core/dotnet2.2/CHANGELOG.md)
-
-
-## Quick .NET Core Action
-A .NET Core action is a .NET Core class library with a method called `Main`
that has the exact signature as follows:
-
-```csharp
-public Newtonsoft.Json.Linq.JObject Main(Newtonsoft.Json.Linq.JObject);
-```
-
-In order to compile, test and archive .NET Core projects, you must have the
[.NET Core SDK](https://www.microsoft.com/net/download) installed locally and
the
[openwhisk-deploy-kube] branch master updated: remove documentation/scripts for kubeadm-dind-cluster (#549)
This is an automated email from the ASF dual-hosted git repository. rabbah pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git The following commit(s) were added to refs/heads/master by this push: new 997df63 remove documentation/scripts for kubeadm-dind-cluster (#549) 997df63 is described below commit 997df63a0371f4991552afe6283b1ad3fb33386e Author: David Grove AuthorDate: Fri Nov 22 09:16:01 2019 -0500 remove documentation/scripts for kubeadm-dind-cluster (#549) The kubeadm-dind-cluster has been archived/ended. We migrated to using the suggested replacement, kind, about a month ago and travis seems stable using kind. Therefore it is time to cleanup old scripts and user-facing documentation. Fixes #508. --- docs/k8s-dind-cluster.md | 133 -- docs/troubleshooting.md | 3 +- helm/openwhisk/templates/_invoker-helpers.tpl | 4 - helm/openwhisk/values-metadata.yaml | 6 -- helm/openwhisk/values.yaml| 2 - tools/travis/dind-cluster-v12.patch | 11 --- tools/travis/start-kubeadm-dind.sh| 78 --- 7 files changed, 1 insertion(+), 236 deletions(-) diff --git a/docs/k8s-dind-cluster.md b/docs/k8s-dind-cluster.md deleted file mode 100644 index 724b309..000 --- a/docs/k8s-dind-cluster.md +++ /dev/null @@ -1,133 +0,0 @@ - - - -# Deploying OpenWhisk on kubeadm-dind-cluster - -## Overview - -On Linux, you can run Kubernetes on top of Docker using the -[kubeadm-dind-cluster](https://github.com/kubernetes-retired/kubeadm-dind-cluster) -project. Based on using Docker-in-Docker (DIND) virtualization and -`kubeadm`, kubeadm-dind-cluster can be used to create a -multi-node Kubernetes cluster that is suitable for deploying -OpenWhisk for development and testing. For detailed instructions on kubeadm-dind-cluster, we -refer you to that project's [github repository](https://github.com/kubernetes-retired/kubeadm-dind-cluster). -Here we will only cover the basic operations needed to create and -operate a default cluster with two virtual worker nodes running on a -single host machine. - -NOTE: The kubeadm-dind-cluster project was recently deprecated in favor of [kind](https://kind.sigs.k8s.io/). -We have a [work item](https://github.com/apache/openwhisk-deploy-kube/issues/508) to migrate our -CI testing to using kind and document its setup for end users. *Contributions Welcome!* - -## Initial setup - -There are "fixed" scripts -[available](https://github.com/kubernetes-retired/kubeadm-dind-cluster/tree/master/fixed) -for each major release of Kubernetes. -Our TravisCI testing uses kubeadm-dind-cluster.sh on an ubuntu 18.04 -host. The `fixed` `dind-cluster` scripts for Kubernetes version 1.13, -and 1.14 are known to work for deploying OpenWhisk. - -### Creating the Kubernetes Cluster - -First, make sure your userid is in the `docker` group on the host -machine. This will enable you to run `dind-cluster.sh` script without -requiring `sudo` to gain `root` privileges. - -To initially create your cluster, do the following: -```shell -# Get the script for the Kubernetes version you want -wget https://github.com/kubernetes-retired/kubeadm-dind-cluster/releases/download/v0.3.0/dind-cluster-v1.14.sh - -# Make it executable -chmod +x dind-cluster-v1.14.sh - -# Start the cluster. Please note you *must* set `USE_HAIRPIN` to `true` -USE_HAIRPIN=true ./dind-cluster-v1.14.sh up - -# add the directory containing kubectl to your PATH -export PATH="$HOME/.kubeadm-dind-cluster:$PATH" -``` - -The default configuration of `dind-cluster.sh` will create a cluster -with three nodes: 1 master node and two worker nodes. We recommend -labeling the two worker nodes for OpenWhisk so that you have 1 invoker -node for running user actions and 1 core node for running the rest of -the OpenWhisk system. -```shell -kubectl label node kube-node-1 openwhisk-role=core -kubectl label node kube-node-2 openwhisk-role=invoker -``` - -### Configuring OpenWhisk - - -You will be using a NodePort ingress to access OpenWhisk. Assuming -`kubectl describe node kube-node-1 | grep InternalIP` returns 10.192.0.3 -and port 31001 is available to be used on your host machine, a -mycluster.yaml for a standard deployment of OpenWhisk would be: -```yaml -whisk: - ingress: -type: NodePort -apiHostName: 10.192.0.3 -apiHostPort: 31001 - -nginx: - httpsNodePort: 31001 - -invoker: - containerFactory: -dind: true - -k8s: - persistence: -enabled: false -``` - -Note the stanza setting `invoker.containerFactory.dind` to true. This -is needed because the logs for docker containers running on the -virtual worker nodes are in a non-standard location, requiring special -configuration of OpenWhisk's invoker pods. Failure to set this -variable when running on kubeadm-dind-cluster will result in an -OpenWhisk deployment that
[openwhisk] branch master updated: Remove usages of rxscala and replace with Java based code. (#4744)
This is an automated email from the ASF dual-hosted git repository.
markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new d3bb290 Remove usages of rxscala and replace with Java based code.
(#4744)
d3bb290 is described below
commit d3bb290432d4403155e92918f4ddc2c692eefa99
Author: Markus Thömmes
AuthorDate: Fri Nov 22 13:31:47 2019 +0100
Remove usages of rxscala and replace with Java based code. (#4744)
* Remove usages of rxscala and replace with Java based code.
* Convert to SAM.
* Fix rebase screw up.
---
common/scala/build.gradle | 2 +-
.../core/database/cosmosdb/RxObservableImplicits.scala | 10 ++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index d54b62e..9d57b4e 100644
--- a/common/scala/build.gradle
+++ b/common/scala/build.gradle
@@ -81,7 +81,7 @@ dependencies {
compile "io.zipkin.reporter2:zipkin-sender-okhttp3:2.6.1"
compile "io.zipkin.reporter2:zipkin-reporter:2.6.1"
-compile "io.reactivex:rxscala_${gradle.scala.depVersion}:0.26.5"
+compile "io.reactivex:rxjava:1.3.8"
compile "io.reactivex:rxjava-reactive-streams:1.2.1"
compile "com.microsoft.azure:azure-cosmosdb:2.6.2"
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/database/cosmosdb/RxObservableImplicits.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/database/cosmosdb/RxObservableImplicits.scala
index cf9e79c..53f303c 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/database/cosmosdb/RxObservableImplicits.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/database/cosmosdb/RxObservableImplicits.scala
@@ -18,8 +18,8 @@
package org.apache.openwhisk.core.database.cosmosdb
import com.microsoft.azure.cosmosdb.{FeedResponse, Resource, ResourceResponse}
-import rx.lang.scala.JavaConverters._
import rx.Observable
+import rx.functions.Action1
import scala.collection.JavaConverters._
import scala.concurrent.{Future, Promise}
@@ -34,8 +34,10 @@ private[cosmosdb] trait RxObservableImplicits {
* @return the head result of the [[Observable]].
*/
def head(): Future[T] = {
+ def toHandler[P](f: (P) => Unit): Action1[P] = (t: P) => f(t)
+
val promise = Promise[T]()
- observable.asScala.single.subscribe(x => promise.success(x), e =>
promise.failure(e))
+ observable.single.subscribe(toHandler(promise.success),
toHandler(promise.failure))
promise.future
}
}
@@ -46,8 +48,8 @@ private[cosmosdb] trait RxObservableImplicits {
implicit class RxScalaFeedObservable[T <: Resource](observable:
Observable[FeedResponse[T]]) {
def blockingOnlyResult(): Option[T] = {
- val value = observable.asScala.toList.toBlocking.single
- val results = value.head.getResults.asScala
+ val value = observable.toBlocking.single
+ val results = value.getResults.asScala
require(results.isEmpty || results.size == 1, s"More than one result
found $results")
results.headOption
}
[openwhisk] branch master updated (6db4fe6 -> 0d4db67)
This is an automated email from the ASF dual-hosted git repository. chetanm pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk.git. from 6db4fe6 Update alpakka-file to version 1.1.2. (#4745) add 0d4db67 Update akka libraries to version 2.5.26. (#4739) No new revisions were added by this update. Summary of changes: settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[openwhisk] branch master updated (eb25b67 -> 6db4fe6)
This is an automated email from the ASF dual-hosted git repository. chetanm pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk.git. from eb25b67 Enable strict compile options on all scala projects and fix warnings. (#4742) add 6db4fe6 Update alpakka-file to version 1.1.2. (#4745) No new revisions were added by this update. Summary of changes: common/scala/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
