Merge branch 'master' of https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm

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.0.1
+version: 0.2.4
 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

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