From 8ba595fca33ad9e2e2a21dd7210a001e45619b30 Mon Sep 17 00:00:00 2001 From: sido Date: Tue, 6 Nov 2018 16:19:54 +0000 Subject: [PATCH] updated servicenames --- charts/opal/Chart.yaml | 4 ++-- charts/opal/charts/mongodb-4.8.1.tgz | Bin 12908 -> 0 bytes charts/opal/requirements.lock | 8 ++++---- charts/opal/requirements.yaml | 4 ++-- charts/opal/templates/service.yaml | 6 +++--- charts/opal/values.yaml | 8 ++++++-- charts/rstudio/templates/ingress.yaml | 4 ++-- charts/rstudio/templates/service.yaml | 6 +++--- 8 files changed, 22 insertions(+), 18 deletions(-) delete mode 100644 charts/opal/charts/mongodb-4.8.1.tgz diff --git a/charts/opal/Chart.yaml b/charts/opal/Chart.yaml index ae8eaa7..70600cf 100644 --- a/charts/opal/Chart.yaml +++ b/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 -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 diff --git a/charts/opal/charts/mongodb-4.8.1.tgz b/charts/opal/charts/mongodb-4.8.1.tgz deleted file mode 100644 index 8c5f18951e65e7f6eeb55b4087cf6930da935805..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12908 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 BZ0rC4 diff --git a/charts/opal/requirements.lock b/charts/opal/requirements.lock index 5d13ffd..abe3070 100644 --- a/charts/opal/requirements.lock +++ b/charts/opal/requirements.lock @@ -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 diff --git a/charts/opal/requirements.yaml b/charts/opal/requirements.yaml index 05852e8..74d6955 100644 --- a/charts/opal/requirements.yaml +++ b/charts/opal/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - - name: mongodb - version: ^4.8.1 + - name: mysql + version: ^0.10.2 repository: https://kubernetes-charts.storage.googleapis.com/ \ No newline at end of file diff --git a/charts/opal/templates/service.yaml b/charts/opal/templates/service.yaml index 9384b2e..c2b0e8d 100644 --- a/charts/opal/templates/service.yaml +++ b/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" . }} diff --git a/charts/opal/values.yaml b/charts/opal/values.yaml index 1078649..18d5d81 100644 --- a/charts/opal/values.yaml +++ b/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 diff --git a/charts/rstudio/templates/ingress.yaml b/charts/rstudio/templates/ingress.yaml index 5df123a..817b4b7 100644 --- a/charts/rstudio/templates/ingress.yaml +++ b/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: diff --git a/charts/rstudio/templates/service.yaml b/charts/rstudio/templates/service.yaml index 6042903..bcbaaae 100644 --- a/charts/rstudio/templates/service.yaml +++ b/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" . }}