diff --git a/httpd/v1.0.0/questions.yml b/httpd/v1.0.0/questions.yml index 3799f95..4463054 100644 --- a/httpd/v1.0.0/questions.yml +++ b/httpd/v1.0.0/questions.yml @@ -48,13 +48,13 @@ questions: type: hostname required: true label: Hostname - - variable: httpd.proxy + - variable: service.proxy default: "" description: "Proxy for your services (comma separated, example: [service]:[port]:[path])" type: string required: false label: Proxy - - variable: httpd.hostname + - variable: service.hostname default: "test.molgenis.org" description: "Hostname for your services (comma separated, example: [hostname]:[port])" type: string diff --git a/httpd/v1.0.0/templates/deployment.yaml b/httpd/v1.0.0/templates/deployment.yaml index 4024364..c3f7cae 100644 --- a/httpd/v1.0.0/templates/deployment.yaml +++ b/httpd/v1.0.0/templates/deployment.yaml @@ -29,9 +29,9 @@ spec: protocol: TCP env: - name: SERVER_NAME - value: "{{ .Values.httpd.hostname }}" + value: "{{ .Values.service.hostname }}" - name: PROXY_SERVICE - value: "{{ .Values.httpd.proxy }}" + value: "{{ .Values.service.proxy }}" livenessProbe: httpGet: path: / diff --git a/httpd/v1.0.0/values.yaml b/httpd/v1.0.0/values.yaml index 650186a..1b56f5b 100644 --- a/httpd/v1.0.0/values.yaml +++ b/httpd/v1.0.0/values.yaml @@ -9,7 +9,7 @@ image: tag: lts pullPolicy: IfNotPresent -httpd: +service: type: ClusterIP port: 80 proxy: httpd:80:/