From adfd742ecb24c9b9c974f47c69f2312fc730c3d8 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Mon, 30 Jul 2018 17:23:58 +0200
Subject: [PATCH] add questions and updated post body

---
 molgenis-preview/questions.yml             | 11 +++++++++++
 molgenis-preview/templates/deployment.yaml |  4 ++++
 molgenis-preview/templates/ingress.yaml    |  2 +-
 molgenis-preview/values.yaml               |  9 +++------
 4 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 molgenis-preview/questions.yml

diff --git a/molgenis-preview/questions.yml b/molgenis-preview/questions.yml
new file mode 100644
index 0000000..85819f6
--- /dev/null
+++ b/molgenis-preview/questions.yml
@@ -0,0 +1,11 @@
+
+categories:
+- MOLGENIS
+questions:
+- variable: ingress.hosts[0].name
+  default: "test.molgenis.org"
+  description: "Hostname for your stack"
+  type: hostname
+  required: true
+  group: "Services and Load Balancing"
+  label: Hostname
\ No newline at end of file
diff --git a/molgenis-preview/templates/deployment.yaml b/molgenis-preview/templates/deployment.yaml
index 8eab288..8b638b8 100644
--- a/molgenis-preview/templates/deployment.yaml
+++ b/molgenis-preview/templates/deployment.yaml
@@ -1,6 +1,10 @@
 apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
+  {{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+  {{- end }}
   name: {{ template "molgenis.fullname" . }}
   labels:
     app: {{ template "molgenis.name" . }}
diff --git a/molgenis-preview/templates/ingress.yaml b/molgenis-preview/templates/ingress.yaml
index 6fdfb0c..26c3c76 100644
--- a/molgenis-preview/templates/ingress.yaml
+++ b/molgenis-preview/templates/ingress.yaml
@@ -27,7 +27,7 @@ spec:
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ . }}
+    - host: {{ .name }}
       http:
         paths:
           - path: {{ $ingressPath }}
diff --git a/molgenis-preview/values.yaml b/molgenis-preview/values.yaml
index df8fce2..a2b04d3 100644
--- a/molgenis-preview/values.yaml
+++ b/molgenis-preview/values.yaml
@@ -8,14 +8,11 @@ service:
 
 ingress:
   enabled: true
-  annotations: {
-    nginx.ingress.kubernetes.io/proxy-body-size: 0
-  }
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
   path: /
   hosts:
-    - test.molgenis.org
+  - name: test.molgenis.org
   tls: []
 
 molgenis: