Make Ingress proxy-read-timeout Configurable
There is a need to make the proxy-read-timeout configurable so that we can alter the value to handle request that takes more than a minute (default timeout) to process Also increase http-timeout for uwsgi to 600 seconds Change-Id: I25dabc648822252a7918d6272c78fb8ebc236b6c
This commit is contained in:
parent
c9d6660d91
commit
cf1e822599
|
@ -32,6 +32,7 @@ metadata:
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
kubernetes.io/ingress.class: "nginx"
|
||||||
ingress.kubernetes.io/rewrite-target: /
|
ingress.kubernetes.io/rewrite-target: /
|
||||||
|
nginx.ingress.kubernetes.io/proxy-read-timeout: {{ .Values.network.airflow.ingress.proxy_read_timeout | quote }}
|
||||||
spec:
|
spec:
|
||||||
rules:
|
rules:
|
||||||
{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
|
{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
|
||||||
|
|
|
@ -32,6 +32,7 @@ metadata:
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
kubernetes.io/ingress.class: "nginx"
|
||||||
ingress.kubernetes.io/rewrite-target: /
|
ingress.kubernetes.io/rewrite-target: /
|
||||||
|
nginx.ingress.kubernetes.io/proxy-read-timeout: {{ .Values.network.shipyard.ingress.proxy_read_timeout | quote }}
|
||||||
spec:
|
spec:
|
||||||
rules:
|
rules:
|
||||||
{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
|
{{- range $key1, $vHost := tuple $hostName $hostNameNamespaced $hostNameFull }}
|
||||||
|
|
|
@ -41,12 +41,14 @@ network:
|
||||||
shipyard:
|
shipyard:
|
||||||
ingress:
|
ingress:
|
||||||
public: true
|
public: true
|
||||||
|
proxy_read_timeout: 600
|
||||||
port: 9000
|
port: 9000
|
||||||
node_port: 31901
|
node_port: 31901
|
||||||
enable_node_port: false
|
enable_node_port: false
|
||||||
airflow:
|
airflow:
|
||||||
ingress:
|
ingress:
|
||||||
public: true
|
public: true
|
||||||
|
proxy_read_timeout: 600
|
||||||
flower:
|
flower:
|
||||||
name: airflow-flower
|
name: airflow-flower
|
||||||
port: 5555
|
port: 5555
|
||||||
|
|
|
@ -18,6 +18,7 @@ set -ex
|
||||||
|
|
||||||
CMD="shipyard"
|
CMD="shipyard"
|
||||||
PORT=${PORT:-9000}
|
PORT=${PORT:-9000}
|
||||||
|
HTTP_TIMEOUT=${HTTP_TIMEOUT:-600}
|
||||||
# Number of uWSGI workers to handle API request
|
# Number of uWSGI workers to handle API request
|
||||||
SHIPYARD_API_WORKERS=${SHIPYARD_API_WORKERS:-"4"}
|
SHIPYARD_API_WORKERS=${SHIPYARD_API_WORKERS:-"4"}
|
||||||
#Threads per worker
|
#Threads per worker
|
||||||
|
@ -32,7 +33,8 @@ if [ "$1" = 'server' ]; then
|
||||||
-L \
|
-L \
|
||||||
--pyargv "--config-file /etc/shipyard/shipyard.conf" \
|
--pyargv "--config-file /etc/shipyard/shipyard.conf" \
|
||||||
--threads $SHIPYARD_API_THREADS \
|
--threads $SHIPYARD_API_THREADS \
|
||||||
--workers $SHIPYARD_API_WORKERS
|
--workers $SHIPYARD_API_WORKERS \
|
||||||
|
--http-timeout ${HTTP_TIMEOUT}
|
||||||
else
|
else
|
||||||
# Execute shipyard command
|
# Execute shipyard command
|
||||||
exec ${CMD} $@
|
exec ${CMD} $@
|
||||||
|
|
Loading…
Reference in New Issue