updated servicenames

charts/opal/Chart.yaml

@@ -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
+- https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm.git
-icon: https://git.webhosting.rug.nl/opal/opal-ops-docker-helm/
+icon: https://git.webhosting.rug.nl/molgenis/thirdparty-ops-docker-helm/
 home: https://obiba.org
 maintainers:
 - name: sidohaakma

charts/opal/requirements.lock

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

charts/opal/requirements.yaml

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

charts/opal/templates/service.yaml

@@ -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" . }}

charts/opal/values.yaml

@@ -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

charts/rstudio/templates/ingress.yaml

@@ -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:

charts/rstudio/templates/service.yaml

@@ -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" . }}