Merge branch 'master' of p281392/thirdparty-ops-docker-helm into master

charts/molgenis-website/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: MOLGENIS Helm chart for OpenCPU
 name: molgenis-website
-version: 0.2.4
+version: 0.3.0
 sources:
 - https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm.git
 icon: https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm/raw/master/charts/molgenis-website/catalogIcon-molgenis-website.png

charts/molgenis-website/questions.yml

@@ -2,27 +2,17 @@
 categories:
 - MOLGENIS
 questions:
-- variable: ingress.enabled
+- variable: ingress.hosts[0].name
-  label: Enable ingress
+  label: Hostname(s)
-  default: false
+  default: "site.dev.molgenis.org"
-  description: "Enable ingress"
+  description: "Specify a hostname for this MOLGENIS website instance"
-  type: boolean
+  type: hostname
-  required: true
-  group: "Load balancing"
-- variable: opencpu.image.repository
-  label: Registry
-  default: "registry.hub.docker.com"
-  description: "Select a registry to pull from"
-  type: enum
-  options:
-  - "registry.hub.docker.com"
-  - "registry.molgenis.org"
   required: true
   group: "Provisioning"
-- variable: opencpu.image.tag
+- variable: image.image.tag
   label: Version
   default: ""
-  description: "Select a OpenCPU version (check the registry.molgenis.org or hub.docker.com for released tags)"
+  description: "Select a MOLGENIS website version (check the registry.molgenis.org for released tags)"
   type: string
   required: true
   group: "Provisioning"