rabbah closed pull request #93: mirror PR 3010 "adapt timeouts of controller
and nginx"
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/93
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/controller/controller.yml
b/kubernetes/controller/controller.yml
index a696a70..4038f4c 100644
--- a/kubernetes/controller/controller.yml
+++ b/kubernetes/controller/controller.yml
@@ -68,10 +68,8 @@ spec:
value: "-Xmx2g"
# Kafka properties
- - name: "KAFKA_HOST"
- value: "kafka.openwhisk"
- - name: "KAFKA_HOST_PORT"
- value: "9092"
+ - name: "KAFKA_HOSTS"
+ value: "kafka.openwhisk:9092"
# specific controller arguments
- name: "CONTROLLER_INSTANCES"
diff --git a/kubernetes/invoker/invoker.yml b/kubernetes/invoker/invoker.yml
index e79be7b..57d1c38 100644
--- a/kubernetes/invoker/invoker.yml
+++ b/kubernetes/invoker/invoker.yml
@@ -85,16 +85,12 @@ spec:
value: ""
# Kafka properties
- - name: "KAFKA_HOST"
- value: "kafka.openwhisk"
- - name: "KAFKA_HOST_PORT"
- value: "9092"
+ - name: "KAFKA_HOSTS"
+ value: "kafka.openwhisk:9092"
# zookeeper info
- - name: "ZOOKEEPER_HOST"
- value: "zookeeper.openwhisk"
- - name: "ZOOKEEPER_PORT"
- value: "2181"
+ - name: "ZOOKEEPER_HOSTS"
+ value: "zookeeper.openwhisk:2181"
# This property can change since it is generated via Ansible
GroupVars
- name: "RUNTIMES_MANIFEST"
diff --git a/kubernetes/nginx/nginx.conf b/kubernetes/nginx/nginx.conf
index 1f586fa..c32a432 100644
--- a/kubernetes/nginx/nginx.conf
+++ b/kubernetes/nginx/nginx.conf
@@ -40,7 +40,7 @@ http {
rewrite /(.*) /api/v1/web/${namespace}/$1 break;
}
proxy_pass http://$controller:8080;
- proxy_read_timeout 70s; # 60+10 additional seconds to allow
controller to terminate request
+ proxy_read_timeout 75s; # 70+5 additional seconds to allow
controller to terminate request
}
# proxy to 'public/html' web action by convention
@@ -49,7 +49,7 @@ http {
rewrite ^ /api/v1/web/${namespace}/public/index.html break;
}
proxy_pass http://$controller:8080;
- proxy_read_timeout 70s; # 60+10 additional seconds to allow
controller to terminate request
+ proxy_read_timeout 75s; # 70+5 additional seconds to allow
controller to terminate request
}
location /blackbox-0.1.0.tar.gz {
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
