From 663dabd75c13b03213676e0bd8b8a32ab599b2f6 Mon Sep 17 00:00:00 2001 From: sido Date: Fri, 22 Jun 2018 23:14:49 +0200 Subject: [PATCH] fix(proxy): add proxy --- httpd/v1.0.0/questions.yml | 12 +++++++++--- httpd/v1.0.0/templates/deployment.yaml | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/httpd/v1.0.0/questions.yml b/httpd/v1.0.0/questions.yml index 1140709..68477fe 100644 --- a/httpd/v1.0.0/questions.yml +++ b/httpd/v1.0.0/questions.yml @@ -43,14 +43,20 @@ questions: group: "Services and Load Balancing" subquestions: - variable: ingress.hosts[0].name - default: "" - description: "Hostname to your stack" + default: "test.molgenis.org" + description: "Hostname for your stack" type: hostname required: true label: Hostname - variable: httpd.proxy default: "[service]:[port]:[path]" - description: "Proxy to services (comma separated)" + description: "Proxy for your services (comma separated)" type: string required: false + label: Proxy + - variable: httpd.hostname + default: "test.molgenis.org" + description: "Hostname for your stack (comma separated)" + type: string + required: true label: Proxy \ No newline at end of file diff --git a/httpd/v1.0.0/templates/deployment.yaml b/httpd/v1.0.0/templates/deployment.yaml index 901df29..d452786 100644 --- a/httpd/v1.0.0/templates/deployment.yaml +++ b/httpd/v1.0.0/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: protocol: TCP env: - name: SERVER_NAME - value: {{ .Values.ingress.hosts[0].name }} + value: {{ .Values.httpd.hostname }} - name: PROXY_SERVICE value: {{ .Values.httpd.proxy }} livenessProbe: