p281392/thirdparty-ops-docker-helm
1
0
Fork 0
forked from molgenis/thirdparty-ops-docker-helm
Code Releases Activity

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

Browse Source
This commit is contained in:
Sido Haakma 2018-11-28 20:29:44 +00:00 committed by Gogs
commit 1a3212ee42
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/molgenis-website/Chart.yaml
View File

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.0" appVersion: "1.0"
description: MOLGENIS Helm chart for OpenCPU description: MOLGENIS Helm chart for OpenCPU
name: molgenis-website name: molgenis-website
version: 0.0.1 version: 0.2.4
sources: sources:
- https://github.com/molgenis/molgenis-ops-docker-helm.git - 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 icon: https://raw.githubusercontent.com/molgenis/molgenis-ops-docker-helm/master/charts/molgenis-website/catalog-molgenis-website.svg

14
charts/molgenis-website/templates/ingress.yaml
View File

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

2
charts/molgenis-website/templates/service.yaml
View File

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

2
charts/molgenis-website/values.yaml
View File

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