Commit 8db315e1 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Helm chart supports nomad cluster, buffering, better timeouts.

parent b6da26ee
......@@ -85,6 +85,8 @@ spec:
port: 8000
initialDelaySeconds: 5
periodSeconds: 5
nodeSelector:
nomadtype: public
imagePullSecrets:
- name: {{ .Values.images.secret }}
imagePullPolicy: always
......
......@@ -75,6 +75,8 @@ spec:
port: 8080
initialDelaySeconds: 3
periodSeconds: 3
nodeSelector:
nomadtype: public
imagePullSecrets:
- name: {{ .Values.images.secret }}
imagePullPolicy: always
......
......@@ -19,10 +19,36 @@ data:
}
location {{ .Values.proxy.external.path }}/api {
proxy_set_header Host $host;
proxy_pass_request_headers on;
proxy_pass http://{{ include "nomad.fullname" . }}-api:{{ .Values.api.port }};
proxy_connect_timeout {{ .Values.proxy.timeout }};
proxy_send_timeout {{ .Values.proxy.timeout }};
proxy_read_timeout {{ .Values.proxy.timeout }};
send_timeout {{ .Values.proxy.timeout }};
}
location {{ .Values.proxy.external.path }}/api/uploads {
client_max_body_size 20g;
proxy_request_buffering off;
proxy_set_header Host $host;
proxy_pass_request_headers on;
proxy_pass http://{{ include "nomad.fullname" . }}-api:{{ .Values.api.port }};
proxy_connect_timeout {{ .Values.proxy.timeout }};
proxy_send_timeout {{ .Values.proxy.datatimeout }};
proxy_read_timeout {{ .Values.proxy.timeout }};
send_timeout {{ .Values.proxy.timeout }};
}
location {{ .Values.proxy.external.path }}/api/raw {
proxy_buffering off;
proxy_set_header Host $host;
proxy_pass_request_headers on;
proxy_pass http://{{ include "nomad.fullname" . }}-api:{{ .Values.api.port }};
proxy_connect_timeout {{ .Values.proxy.timeout }};
proxy_send_timeout {{ .Values.proxy.timeout }};
proxy_read_timeout {{ .Values.proxy.datatimeout }};
send_timeout {{ .Values.proxy.timeout }};
}
}
---
......@@ -58,6 +84,8 @@ spec:
name: nginx-conf
- mountPath: /var/log/nginx
name: log
nodeSelector:
nomadtype: public
volumes:
- name: nginx-conf
configMap:
......
......@@ -94,6 +94,8 @@ spec:
- NOMAD_LOGSTASH_LEVEL=30 python -m celery -A nomad.processing status | grep "${HOSTNAME}:.*OK"
initialDelaySeconds: 5
periodSeconds: 120
nodeSelector:
nomadtype: worker
imagePullSecrets:
- name: {{ .Values.images.secret }}
imagePullPolicy: always
......
......@@ -60,6 +60,8 @@ proxy:
port: 80
nodePort: 30003
nodeIP: 130.183.207.116
timeout: 600
datatimeout: 3600
external:
host: "enc-staging-nomad.esc.rzg.mpg.de"
port: 80
......@@ -68,6 +70,8 @@ proxy:
## configuration of the chart dependency for rabbitmq
rabbitmq:
nodeSelector:
nomadtype: public
image.pullSecrets: nil
rabbitmq:
username: rabbitmq
......@@ -111,5 +115,5 @@ mail:
## Everything concerning the data that is used by the service
volumes:
files: /scratch/nomad-fair/fs
files: /nomad/fairdi/fs
nomad: /nomad
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment