updated servicenames

This commit is contained in:
sido 2018-11-06 16:19:54 +00:00
parent c225d71968
commit 8ba595fca3
8 changed files with 22 additions and 18 deletions

View File

@ -4,8 +4,8 @@ description: Opal - helm stack (in BETA)
name: opal
version: 0.0.1
sources:
- https://git.webhosting.rug.nl/opal/opal-ops-docker-helm.git
icon: https://git.webhosting.rug.nl/opal/opal-ops-docker-helm/
- https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm.git
icon: https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm/
home: https://obiba.org
maintainers:
- name: sidohaakma

Binary file not shown.

View File

@ -1,6 +1,6 @@
dependencies:
- name: mongodb
- name: mysql
repository: https://kubernetes-charts.storage.googleapis.com/
version: 4.8.1
digest: sha256:14ec2719c92a969b8dcac0de0deea31154c4dc135710f43acb7f0dc209faa9ea
generated: 2018-11-06T10:03:54.890729161Z
version: 0.10.2
digest: sha256:77710fe100fb005d51e006d2e19643f9af2b1aadd1c2249c67ffc5be6a095f30
generated: 2018-11-06T15:57:20.530933765Z

View File

@ -1,4 +1,4 @@
dependencies:
- name: mongodb
version: ^4.8.1
- name: mysql
version: ^0.10.2
repository: https://kubernetes-charts.storage.googleapis.com/

View File

@ -1,16 +1,16 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.service.name }}
name: "{{ .Release.Name }}-{{ .Values.service.name }}"
labels:
app: {{ .Values.service.name }}
app: "{{ .Release.Name }}-{{ .Values.service.name }}"
chart: {{ template "opal.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.service.type }}
ports:
- name: {{ .Values.service.name }}
- name: "{{ .Release.Name }}-{{ .Values.service.name }}"
port: {{ .Values.service.port }}
selector:
app: {{ template "opal.name" . }}

View File

@ -34,7 +34,7 @@ opal:
name: obiba/opal
tag: latest
pullPolicy: Always
adminPassword: admin
adminPassword: ?01LifeCycle!
persistence:
claim: pvc-opal
size: 10Gi
@ -55,9 +55,13 @@ rserver:
- 6612
- 6311
mongodb:
mysql:
persistence:
enabled: false
mysqlRootPassword: ParaD0xa
mysqlUser: opal
mysqlPassword: ?opal01!
mysqlDatabase: opal_ids
persistence:
enabled: false

View File

@ -5,7 +5,7 @@ kind: Ingress
metadata:
name: "{{ $.Release.Name }}-ingress"
labels:
app: {{ $.Values.rstudio.name }}
app: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
release: "{{ $.Release.Name }}"
heritage: "{{ $.Release.Service }}"
@ -23,7 +23,7 @@ spec:
paths:
- path: {{ default "/" .path }}
backend:
serviceName: {{ $.Values.rstudio.service.name }}
serviceName: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
servicePort: {{ $.Values.rstudio.service.port }}
{{- if .tls }}
tls:

View File

@ -1,15 +1,15 @@
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.rstudio.service.name }}
name: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
labels:
app: {{ .Values.rstudio.service.name }}
app: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
type: {{ .Values.rstudio.service.type }}
ports:
- name: {{ .Values.rstudio.service.name }}
- name: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
port: {{ .Values.rstudio.service.port }}
selector:
app: {{ template "rstudio.name" . }}