Merge branch 'add-questions' of p281392/molgenis-ops-docker-helm into master

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

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" . }}

molgenis-preview/templates/ingress.yaml

@@ -27,7 +27,7 @@ spec:
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ . }}
+    - host: {{ .name }}
       http:
         paths:
           - path: {{ $ingressPath }}

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: