You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2017/12/18 15:43:11 UTC
[GitHub] rabbah closed pull request #118: synchronize nginx.conf with upstream file
rabbah closed pull request #118: synchronize nginx.conf with upstream file
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/118
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/kubernetes/nginx/nginx.conf b/kubernetes/nginx/nginx.conf
index fbecb67..c9ba6ab 100644
--- a/kubernetes/nginx/nginx.conf
+++ b/kubernetes/nginx/nginx.conf
@@ -1,3 +1,5 @@
+worker_rlimit_nofile 4096;
+
events {
worker_connections 4096;
}
@@ -54,17 +56,41 @@ http {
proxy_read_timeout 75s; # 70+5 additional seconds to allow controller to terminate request
}
+ location /blackbox.tar.gz {
+ return 301 https://github.com/apache/incubator-openwhisk-runtime-docker/releases/download/sdk%400.1.0/blackbox-0.1.0.tar.gz;
+ }
+ # leaving this for a while for clients out there to update to the new endpoint
location /blackbox-0.1.0.tar.gz {
- root /etc/nginx;
+ return 301 /blackbox.tar.gz;
}
location /OpenWhiskIOSStarterApp.zip {
return 301 https://github.com/openwhisk/openwhisk-client-swift/releases/download/0.2.3/starterapp-0.2.3.zip;
}
- location /cli/go/download {
- autoindex on;
- root /etc/nginx;
+ # redirect requests for specific binaries to the matching one from the latest openwhisk-cli release.
+ location /cli/go/download/linux/amd64 {
+ return 301 https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-linux-amd64.tgz;
+ }
+ location /cli/go/download/linux/386 {
+ return 301 https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-linux-386.tgz;
+ }
+ location /cli/go/download/mac/amd64 {
+ return 301 https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-mac-amd64.zip;
}
+ location /cli/go/download/mac/386 {
+ return 301 https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-mac-386.zip;
+ }
+ location /cli/go/download/windows/amd64 {
+ return 301 https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-windows-amd64.zip;
+ }
+ location /cli/go/download/windows/386 {
+ return 301 https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-windows-386.zip;
+ }
+
+ # redirect top-level cli downloads to the latest openwhisk-cli release.
+ location /cli/go/download {
+ return 301 https://github.com/apache/incubator-openwhisk-cli/releases/latest;
+ }
}
}
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 37f56c5..32d4273 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -189,9 +189,9 @@ AUTH_WSK_SECRET=789c46b1-71f6-4ed5-8c54-816aa4f8c502:abczO3xZCLrMN6v2BKK1dXYFpXl
AUTH_GUEST=23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP
WSK_PORT=$(kubectl -n openwhisk describe service nginx | grep https-api | grep NodePort| awk '{print $3}' | cut -d'/' -f1)
-# download and setup the wsk cli from nginx
-wget --no-check-certificate https://localhost:$WSK_PORT/cli/go/download/linux/amd64/wsk
-chmod +x wsk
+# download and setup the wsk cli
+wget -q https://github.com/apache/incubator-openwhisk-cli/releases/download/latest/OpenWhisk_CLI-latest-linux-amd64.tgz
+tar xzf OpenWhisk_CLI-latest-linux-amd64.tgz
sudo cp wsk /usr/local/bin/wsk
./wsk property set --auth $AUTH_GUEST --apihost https://localhost:$WSK_PORT
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services