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.0
+version: 0.3.3
 sources:
-- https://github.com/molgenis/molgenis-ops-docker-helm.git
-icon: https://raw.githubusercontent.com/molgenis/molgenis-ops-docker-helm/master/charts/molgenis-website/catalog-molgenis-website.svg
+- 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
 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
-  label: Enable ingress
-  default: false
-  description: "Enable ingress"
-  type: boolean
+- variable: ingress.hosts[0].name
+  label: Hostname(s)
+  default: "site.dev.molgenis.org"
+  description: "Specify a hostname for this MOLGENIS website instance"
+  type: string
   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
+  group: "Loadbalancing"
+- variable: image.image.tag
   label: Version
-  default: ""
-  description: "Select a OpenCPU version (check the registry.molgenis.org or hub.docker.com for released tags)"
+  default: "latest"
+  description: "Select a MOLGENIS website version (check the registry.molgenis.org for released tags)"
   type: string
   required: true
   group: "Provisioning"

charts/molgenis-website/templates/ingress.yaml

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

charts/molgenis-website/templates/service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.website.service.name }}
+  name: {{ .Release.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: stable
+    tag: latest
     pullPolicy: Always
   service:
     name: molgenis-website