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

charts/molgenis-website/Chart.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 appVersion: "1.0"
-description: MOLGENIS Helm chart for OpenCPU
+description: MOLGENIS Helm chart for the website
 name: molgenis-website
-version: 0.2.4
+version: 0.3.3
 sources:
 - https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm.git
-icon: https://raw.git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm/raw/master/charts/molgenis-website/catalogIcon-molgenis-website.png
+icon: https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm/raw/master/charts/molgenis-website/catalogIcon-molgenis-website.png
 home: https://www.molgenis.org
 maintainers:
 - name: sidohaakma

charts/molgenis-website/README.md

@@ -1,6 +1,6 @@
-# MOLGENIS - OpenCPU Helm Chart
+# MOLGENIS - Website Helm Chart
 
-NEXUS repository for kubernetes to deploy on a kubernetes cluster with NFS-share
+Website Helm chart to deploy the molgenis.org website.
 
 ## Containers
 
@@ -9,7 +9,7 @@ This chart will deploy the following containers:
 - NGINX
 
 ## Provisioning
-You can choose for the OpenCPU image from which repository you want to pull. Experimental builds are pushed to registry.molgenis.org and the stable builds to hub.docker.com. 
+You can choose which version of the NGINX image you want to deploy. Each merge with the master results in a tagged image with the build-number.  
 You need to fill out 2 properties to determine which repository you are going to use.
 
 - ```site.image.repository```

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: string
   required: true
-  group: "Load balancing"
+  group: "Loadbalancing"
-- variable: opencpu.image.repository
+- variable: image.image.tag
-  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
   label: Version
-  default: ""
+  default: "latest"
-  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"