chore(chart.yaml): bumped version to 0.2.0

charts/molgenis-website/Chart.yaml

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

charts/molgenis-website/README.md

@@ -1,6 +1,6 @@
-# MOLGENIS - Website Helm Chart
+# MOLGENIS - OpenCPU Helm Chart
 
-Website Helm chart to deploy the molgenis.org website.
+NEXUS repository for kubernetes to deploy on a kubernetes cluster with NFS-share
 
 ## Containers
 
@@ -9,7 +9,7 @@ This chart will deploy the following containers:
 - NGINX
 
 ## Provisioning
-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 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 need to fill out 2 properties to determine which repository you are going to use.
 
 - ```site.image.repository```

charts/molgenis-website/questions.yml

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

charts/molgenis-website/templates/ingress.yaml

@@ -1,4 +1,5 @@
 {{- if .Values.ingress.enabled }}
+{{- range .Values.ingress.hosts }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -9,30 +10,27 @@ metadata:
     release: "{{ $.Release.Name }}"
     heritage: "{{ $.Release.Service }}"
   annotations:
-    {{- if .Values.ingress.tls }}
+    {{- if .tls }}
     ingress.kubernetes.io/secure-backends: "true"
     {{- end }}
-    {{- range $key, $value := .Values.ingress.annotations }}
+    {{- range $key, $value := .annotations }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
   rules:
-  {{- range .Values.ingress.hosts }}
   - host: {{ .name }}
     http:
       paths:
         - path: {{ default "/" .path }}
           backend:
-            serviceName: {{ $.Release.Name }}-{{ $.Values.website.service.name }}
+            serviceName: {{ $.Values.website.service.name }}
             servicePort: {{ $.Values.website.service.port }}
-  {{- end }}
 {{- if .tls }}
   tls:
   - hosts:
-    {{- range .Values.ingress.hosts }}
     - {{ .name }}
-    {{- end }}
+    secretName: {{ .tlsSecret }}
-    secretName: {{ .Values.ingress.tlsSecret }}
 {{- end }}
 ---
 {{- end }}
+{{- end }}

charts/molgenis-website/templates/service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.website.service.name }}
+  name: {{ .Values.website.service.name }}
   labels:
     app: {{ .Values.website.service.name }}
     release: {{ .Release.Name }}

charts/molgenis-website/values.yaml

@@ -14,7 +14,7 @@ website:
   image:
     repository: registry.molgenis.org
     name: molgenis/website
-    tag: latest
+    tag: stable
     pullPolicy: Always
   service:
     name: molgenis-website