[incubator-openwhisk-deploy-kube] branch master updated: add ingress configuration for IBM Cloud Standard Clusters to Helm deploy (#200)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git The following commit(s) were added to refs/heads/master by this push: new 58b9b4e add ingress configuration for IBM Cloud Standard Clusters to Helm deploy (#200) 58b9b4e is described below commit 58b9b4eab738c0de2bdbb866b2b3b9b5e4d67629 Author: David GroveAuthorDate: Wed May 16 19:36:13 2018 -0400 add ingress configuration for IBM Cloud Standard Clusters to Helm deploy (#200) --- helm/README.md | 35 +- helm/ingress.md| 131 + helm/templates/apigateway.yaml | 11 +--- helm/templates/cluster_config.yaml | 1 - helm/templates/ingress.yaml| 67 +++ helm/values.yaml | 4 +- tools/travis/build-helm.sh | 5 +- 7 files changed, 220 insertions(+), 34 deletions(-) diff --git a/helm/README.md b/helm/README.md index c774a2e..83383aa 100644 --- a/helm/README.md +++ b/helm/README.md @@ -77,26 +77,26 @@ you want to be an invoker, execute $ kubectl label nodes openwhisk-role=invoker ``` -### Step 4. Deploy Charts -You will need to create a mycluster.yaml file that specifies the host -and port information that will be used to access your cluster. See -the [ingress discussion](../kubernetes/ingress/README.md) for -details. Below is a sample file appropriate for a minikube cluster -where `minikube ip` returns `192.168.99.100`. +### Step 4. Define `mycluster.yaml` + +You will need to create a mycluster.yaml file that records how the +OpenWhisk deployment on your cluster will be accessed by clients. See +the [ingress discussion](./ingress.md) for details. Below is a sample +file appropriate for a minikube cluster where `minikube ip` returns +`192.168.99.100` and port 31001 is available to be used. ```yaml whisk: ingress: +type: NodePort api_host: 192.168.99.100:31001 -apigw_url: http://192.168.99.100:31004 nginx: httpsNodePort: 31001 - -apigw: - apiNodePort: 31004 ``` +### Step 5. Deploy Charts + Deployment can be done by using the following single command: ```shell helm install . --namespace=openwhisk --name=your_release_name -f mycluster.yaml @@ -107,18 +107,19 @@ After a while, if you can see all the pods listed by the following command are i kubectl get pods -n openwhisk ``` -### Test Deployment +### Step 6. Configure the `wsk` CLI -Install an [OpenWhisk client](https://github.com/apache/incubator-openwhisk/tree/master/docs) to test the deployed OpenWhisk environment. - -For now, we are using nginx to provide web access for OpenWhisk client. By default, the nginx service is configured to run at port 31000 for HTTP connection and 31001 for HTTPS connection. - -As a result, please run the following command to config your OpenWhisk client: +Configure the OpenWhisk CLI, wsk, by setting the auth and apihost +properties (if you don't already have the wsk cli, follow the +instructions [here](https://github.com/apache/incubator-openwhisk-cli) +to get it). ```shell -wsk property set --apihost http://:31000 +wsk property set --apihost wsk property set --auth 23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP ``` +### Step 7. Test your Deployment + Prepare a small js function like the following and save it to `greeting.js`: ```js /** diff --git a/helm/ingress.md b/helm/ingress.md new file mode 100644 index 000..ce3459a --- /dev/null +++ b/helm/ingress.md @@ -0,0 +1,131 @@ + + +Ingress +--- + +Defining a Kubernetes Ingress is what makes the OpenWhisk system you +are going to deploy available outside of your Kubernetes cluster. When +you select an ingress method, you are determining what values to use +for the `whisk.ingress` stanza of your `mycluster.yaml` file that you +will use in the `helm install` command. You will need to define +values for at least `whisk.ingress.type` and `whisk.ingress.api_host`. + +Unfortunately, the exact details of configuring an Ingress vary across +cloud providers. The detailed instructions +[below](#possible-ingress-types) describe multiple possible Ingress +configurations. We welcome contributions from the community to +describe how to configure Ingress for additional cloud providers. + +If you are deploying on minikube, use the NodePort instructions below. + +# Possible Ingress Types + +## NodePort + +NodePort is the simplest type of Ingress and is suitable for use with +minikube and single node clusters that do not support more advanced +ingress options. Deploying a NodePort ingress will expose a port on +each Kubernetes worker node for OpenWhisk's nginx service. +In this Ingress, TLS termination will be handled by OpenWhisk's +`nginx` service and will use self-signed certificates.
[incubator-openwhisk-runtime-go] branch master updated: Fixes for #10, #24 and #25 (#30)
This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-go.git The following commit(s) were added to refs/heads/master by this push: new cf30330 Fixes for #10, #24 and #25 (#30) cf30330 is described below commit cf30330161d721a46fb03faf2a7f751eb883015d Author: Michele SciabarraAuthorDate: Wed May 16 22:32:19 2018 +0200 Fixes for #10, #24 and #25 (#30) --- .gitignore | 1 + CONTRIBUTING.md| 32 ++-- LICENSE-filetype.txt | 25 +++ LICENSE-testify.txt| 22 +++ LICENSE.txt| 15 ++ README.md | 68 ++--- build.gradle | 9 ++ common/gobuild.sh | 28 +++- golang1.10/Dockerfile | 1 + gradle/README.md | 23 +-- gradlew.bat| 168 ++--- openwhisk/_test/bc.sh | 16 ++ openwhisk/_test/build.sh | 25 +-- openwhisk/_test/exec.go| 20 --- openwhisk/_test/hello.sh | 20 ++- openwhisk/_test/hi.src | 9 +- openwhisk/_test/postcompile.sh | 18 ++- openwhisk/_test/precompile.sh | 16 ++ openwhisk/_test/zips.sh| 16 ++ ...tionProxy_test.go => actionProxy_linux_test.go} | 31 ++-- openwhisk/actionProxy_test.go | 42 -- openwhisk/compiler.go | 21 ++- openwhisk/compiler_test.go | 37 - openwhisk/extractor_test.go| 31 openwhisk/initHandler_linux_test.go| 44 ++ openwhisk/initHandler_test.go | 49 +++--- openwhisk/util_test.go | 57 +-- test/NOTES.md | 31 ++-- test/etc/hello.sh | 2 +- test/start.sh | 6 +- tools/travis/setup.sh | 2 + 31 files changed, 549 insertions(+), 336 deletions(-) diff --git a/.gitignore b/.gitignore index a35ea03..cacf376 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ vendor/ actionProxyLoop/proxy golang1.10/proxy openwhisk/_test/exec +openwhisk/_test/exec.go openwhisk/_test/hi openwhisk/_test/hello_greeting openwhisk/_test/hello_message diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c29a74e..0f7f858 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,19 +1,19 @@ -[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) @@ -36,18 +36,18 @@ Instructions on how to do this can be found here: [http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas) Once submitted, you will receive a confirmation email from the Apache Software Foundation (ASF) and be added to -the following list: http://people.apache.org/unlistedclas.html. +the following list: http://people.apache.org/unlistedclas.html. Project committers will use this list to verify pull requests (PRs) come from contributors that have signed a CLA. -We look forward to your contributions! +We look forward to your contributions! ## Raising issues -Please raise any bug reports or enhancement requests on the respective project repository's GitHub issue tracker. Be sure to search the +Please raise any bug reports or enhancement requests on the respective project repository's GitHub issue tracker. Be sure to search the list to see if your issue has already been raised. -A good bug report is one that make it easy for us to understand what you were trying to do and what went wrong. +A good bug report is one that make it easy for us to understand what you were trying to do and what went wrong. Provide as much context as possible so we can try to recreate the issue. A good enhancement request comes with an explanation of what you are trying to do and how that enhancement would help you. diff --git a/LICENSE-filetype.txt b/LICENSE-filetype.txt new file mode 100644 index 000..c03a05c --- /dev/null +++ b/LICENSE-filetype.txt @@ -0,0 +1,25 @@ +The MIT License + +Copyright (c) Tomas Aparicio + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense,
[incubator-openwhisk-deploy-kube] branch master updated: Add minified Apache license header to all yaml and yml files (#198)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git The following commit(s) were added to refs/heads/master by this push: new 15f1304 Add minified Apache license header to all yaml and yml files (#198) 15f1304 is described below commit 15f1304de1188a11f19416bc60e748cc3d648e65 Author: David GroveAuthorDate: Wed May 16 14:02:22 2018 -0400 Add minified Apache license header to all yaml and yml files (#198) --- helm/Chart.yaml | 3 +++ helm/templates/_affinity.tpl | 3 +++ helm/templates/_helpers.tpl | 3 +++ helm/templates/_readiness.tpl | 3 +++ helm/templates/apigateway.yaml| 3 +++ helm/templates/cluster_config.yaml| 3 +++ helm/templates/controller.yaml| 3 +++ helm/templates/couchdb.yaml | 3 +++ helm/templates/install_catalog_job.yaml | 3 +++ helm/templates/install_routemgmt_job.yaml | 3 +++ helm/templates/invoker.yaml | 3 +++ helm/templates/kafka.yaml | 3 +++ helm/templates/nginx.yaml | 3 +++ helm/templates/nginx_configmap.yaml | 3 +++ helm/templates/nginx_secret.yaml | 3 +++ helm/templates/zookeeper.yaml | 3 +++ helm/values.yaml | 3 +++ kubernetes/apigateway/apigateway.yml | 3 +++ kubernetes/cluster-setup/namespace.yml| 3 +++ kubernetes/cluster-setup/persistent-volumes.yml | 3 +++ kubernetes/cluster-setup/services.yml | 3 +++ kubernetes/controller/controller.yml | 3 +++ kubernetes/couchdb/couchdb.yml| 3 +++ kubernetes/ingress/ingress-ibm.yml| 3 +++ kubernetes/ingress/ingress-simple.yml | 3 +++ kubernetes/invoker/invoker-agent.yml | 3 +++ kubernetes/invoker/invoker-dcf.yml| 3 +++ kubernetes/invoker/invoker-k8scf.yml | 3 +++ kubernetes/kafka/kafka.yml| 3 +++ kubernetes/loadtest/loadtest-latency-internal.yml | 3 +++ kubernetes/loadtest/loadtest-latency.yml | 3 +++ kubernetes/loadtest/loadtest-throughput.yml | 3 +++ kubernetes/nginx/nginx.yml| 3 +++ kubernetes/openwhisk-catalog/install-catalog.yml | 3 +++ kubernetes/package-kafka/kafkapkginstaller.yml| 3 +++ kubernetes/package-kafka/kafkaprovider.yml| 3 +++ kubernetes/routemgmt/install-routemgmt.yml| 3 +++ kubernetes/zookeeper/zookeeper.yml| 3 +++ 38 files changed, 114 insertions(+) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 4a3f712..889345c 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,3 +1,6 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + apiVersion: v1 description: A Helm chart to deploy Apache OpenWhisk for Kubernetes name: openwhisk diff --git a/helm/templates/_affinity.tpl b/helm/templates/_affinity.tpl index efa0d73..237bdc5 100644 --- a/helm/templates/_affinity.tpl +++ b/helm/templates/_affinity.tpl @@ -1,3 +1,6 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + # This file defines template snippets for scheduler affinity and anti-affinity {{/* Generic core affinity */}} diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index 917d311..ddffc1a 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -1,3 +1,6 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + {{/* hostname for apigateway */}} {{- define "apigw_host" -}} {{ .Values.apigw.name }}.{{ .Release.Namespace }}.svc.cluster.local diff --git a/helm/templates/_readiness.tpl b/helm/templates/_readiness.tpl index f9e4174..8e53ec0 100644 --- a/helm/templates/_readiness.tpl +++ b/helm/templates/_readiness.tpl @@ -1,3 +1,6 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + {{/* Init container that waits for couchdb to be ready */}} {{- define "readiness.waitForCouchDB" -}} - name: "wait-for-couchdb" diff --git a/helm/templates/apigateway.yaml b/helm/templates/apigateway.yaml index 6878eaf..15a698c 100644 --- a/helm/templates/apigateway.yaml +++ b/helm/templates/apigateway.yaml @@ -1,3 +1,6 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +#
[incubator-openwhisk] branch master updated: Use Minified ASF License header in Ansible YAML files.
This is an automated email from the ASF dual-hosted git repository. houshengbo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git The following commit(s) were added to refs/heads/master by this push: new 84e906b Use Minified ASF License header in Ansible YAML files. 84e906b is described below commit 84e906bfcb73514fc8ff87f088ec2b917f20b397 Author: Matt RutkowskiAuthorDate: Wed May 16 10:57:27 2018 -0500 Use Minified ASF License header in Ansible YAML files. --- actionRuntimes/actionProxy/invoke.py| 21 ++--- ansible/apigateway.yml | 15 +-- ansible/boot_instances_dist.yml | 15 +-- ansible/controller.yml | 15 +-- ansible/couchdb.yml | 15 +-- ansible/edge.yml| 15 +-- ansible/initdb.yml | 15 +-- ansible/invoker.yml | 15 +-- ansible/kafka.yml | 15 +-- ansible/logs.yml| 15 +-- ansible/openwhisk.yml | 15 +-- ansible/postdeploy.yml | 15 +-- ansible/prereq.yml | 15 +-- ansible/prereq_build.yml| 16 +--- ansible/properties.yml | 15 +-- ansible/provision_env_dist.yml | 15 +-- ansible/publish.yml | 15 +-- ansible/recreateDesignDocs.yml | 15 +-- ansible/registry.yml| 15 +-- ansible/roles/apigateway/tasks/clean.yml| 15 +-- ansible/roles/apigateway/tasks/deploy.yml | 15 +-- ansible/roles/apigateway/tasks/main.yml | 15 +-- ansible/roles/cli-install/tasks/clean.yml | 15 +-- ansible/roles/cli-install/tasks/deploy.yml | 15 +-- ansible/roles/cli-install/tasks/main.yml| 15 +-- ansible/roles/cli/tasks/clean.yml | 15 +-- ansible/roles/cli/tasks/deploy.yml | 15 +-- ansible/roles/cli/tasks/main.yml| 15 +-- ansible/roles/controller/tasks/clean.yml| 15 +-- ansible/roles/controller/tasks/deploy.yml | 15 +-- .../roles/controller/tasks/join_akka_cluster.yml| 15 +-- ansible/roles/controller/tasks/main.yml | 15 +-- ansible/roles/couchdb/tasks/clean.yml | 15 +-- ansible/roles/couchdb/tasks/deploy.yml | 15 +-- ansible/roles/couchdb/tasks/main.yml| 15 +-- ansible/roles/docker/tasks/clean.yml| 15 +-- ansible/roles/docker/tasks/deploy.yml | 15 +-- ansible/roles/docker/tasks/main.yml | 15 +-- ansible/roles/invoker/tasks/clean.yml | 15 +-- ansible/roles/invoker/tasks/deploy.yml | 15 +-- ansible/roles/invoker/tasks/main.yml| 15 +-- ansible/roles/kafka/tasks/clean.yml | 15 +-- ansible/roles/kafka/tasks/deploy.yml| 15 +-- ansible/roles/kafka/tasks/main.yml | 15 +-- ansible/roles/nginx/tasks/clean.yml | 15 +-- ansible/roles/nginx/tasks/deploy.yml| 15 +-- ansible/roles/nginx/tasks/main.yml | 15 +-- ansible/roles/prereq/tasks/clean.yml| 15 +-- ansible/roles/prereq/tasks/deploy.yml | 15 +-- ansible/roles/prereq/tasks/main.yml | 15 +-- ansible/roles/redis/tasks/clean.yml | 15 +-- ansible/roles/redis/tasks/deploy.yml| 15 +-- ansible/roles/redis/tasks/main.yml | 15 +-- ansible/roles/registry/tasks/clean.yml | 15 +-- ansible/roles/registry/tasks/deploy.yml | 15 +-- ansible/roles/registry/tasks/gencert.yml| 15 +-- ansible/roles/registry/tasks/main.yml | 15 +-- ansible/roles/registry/tasks/publish.yml| 15 +-- ansible/roles/routemgmt/tasks/clean.yml | 15 +-- ansible/roles/routemgmt/tasks/deploy.yml| 15
[incubator-openwhisk] branch master updated: Assure nginx verifies downstream ssl certs. (#3658)
This is an automated email from the ASF dual-hosted git repository. cbickel pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git The following commit(s) were added to refs/heads/master by this push: new 22c0807 Assure nginx verifies downstream ssl certs. (#3658) 22c0807 is described below commit 22c0807b9eae20af9acc70b91a1943dd35a95092 Author: Vadim RaskinAuthorDate: Wed May 16 13:00:16 2018 +0200 Assure nginx verifies downstream ssl certs. (#3658) --- ansible/roles/nginx/templates/nginx.conf.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/nginx/templates/nginx.conf.j2 b/ansible/roles/nginx/templates/nginx.conf.j2 index 61ea6fb..a86593f 100644 --- a/ansible/roles/nginx/templates/nginx.conf.j2 +++ b/ansible/roles/nginx/templates/nginx.conf.j2 @@ -26,6 +26,8 @@ http { {% if controller.protocol == 'https' %} proxy_ssl_session_reuse on; proxy_ssl_name {{ controller.ssl.cn }}; +proxy_ssl_verify on; +proxy_ssl_trusted_certificate /etc/nginx/{{ controller.ssl.cert }}; proxy_ssl_protocols TLSv1.1 TLSv1.2; proxy_ssl_certificate /etc/nginx/{{ controller.ssl.cert }}; proxy_ssl_certificate_key /etc/nginx/{{ controller.ssl.key }}; @@ -90,7 +92,6 @@ http { ssl_protocolsTLSv1.2; ssl_ciphers ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256; ssl_prefer_server_ciphers on; -proxy_ssl_verify off; proxy_ssl_session_reuse on; # proxy to the web action path -- To stop receiving notification emails like this one, please contact cbic...@apache.org.