fix nginx proxy configuration conflicts (#3489)

* Allow configuration of nginx proxy config path

* Fix the internal nginx configuration location

Signed-off-by: Johann Queuniet <contact@lordran.net>
This commit is contained in:
Johann Queuniet
2018-10-11 15:33:18 +02:00
committed by k8s-ci-robot
parent 2117e8167d
commit 1911fe5ca8
4 changed files with 5 additions and 4 deletions

View File

@@ -68,6 +68,7 @@ nginx_cpu_requests: 25m
nginx_image_repo: nginx
nginx_image_tag: 1.13
nginx_config_dir: "/etc/nginx"
etcd_config_dir: /etc/ssl/etcd