Commit 34de62d5 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '58-check-the-differences-in-mysql-usage-in-docker-compose-vs-helm-chart' into 'develop'

Resolve "Check the differences in MySQL usage in docker-compose vs Helm chart"

See merge request !65
parents 4ef80f19 56259075

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -4,3 +4,8 @@ 
.classpath

/.settings



compose/kubedir/config

kubernetes/helm/openslice/files/org.etsi.osl.cridge/kubeconfig.yaml

kubernetes/helm/openslice/files/org.etsi.osl.portal.web/src/js/config.js

kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/config.prod.json

kubernetes/helm/openslice/files/org.etsi.osl.tmf.web/src/assets/config/theming.scss

kubernetes/helm/openslice/files/mysql-init/entrypoint.sh

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ create_user() { 
PORTAL_USER="$(< /var/run/secrets/portal/username)"

PORTAL_DATABASE="$(< /var/run/secrets/portal/database)"



TMF_USER="$(< /var/run/secrets/tmf/username)"

TMF_DATABASE="$(< /var/run/secrets/tmf/database)"



KEYCLOAK_USER="$(< /var/run/secrets/keycloak/username)"

KEYCLOAK_DATABASE="$(< /var/run/secrets/keycloak/database)"
@@ -32,11 +35,13 @@ run_mysql --execute \ 
"

# create databases

CREATE DATABASE IF NOT EXISTS $PORTAL_DATABASE;

CREATE DATABASE IF NOT EXISTS $TMF_DATABASE;

CREATE DATABASE IF NOT EXISTS $KEYCLOAK_DATABASE;

CREATE DATABASE IF NOT EXISTS $METRICO_DATABASE;

"



create_user "$PORTAL_USER" "$(< /var/run/secrets/portal/password)"

create_user "$TMF_USER" "$(< /var/run/secrets/tmf/password)"

create_user "$KEYCLOAK_USER" "$(< /var/run/secrets/keycloak/password)"

create_user "$METRICO_USER" "$(< /var/run/secrets/metrico/password)"
@@ -44,6 +49,8 @@ run_mysql --execute \ 
"

# Grant portal user rights to the portal database

GRANT ALL PRIVILEGES ON $PORTAL_DATABASE.* TO '$PORTAL_USER'@'%';

# Grant tmf user rights to the tmf database

GRANT ALL PRIVILEGES ON $TMF_DATABASE.* TO '$TMF_USER'@'%';

# Grant keycloak user rights to the portal database

GRANT ALL PRIVILEGES ON $KEYCLOAK_DATABASE.* TO '$KEYCLOAK_USER'@'%';

# Grant metrico user rights to the portal database

kubernetes/helm/openslice/templates/_helpers.tpl

+8 −0
Original line number Diff line number Diff line
@@ -104,6 +104,14 @@ Secrets 
{{- end }}

{{- end }}



{{- define "openslice.secrets.tmf.mysql" -}}

{{- if .Values.oscreds.mysql.tmf.existingSecret }}

{{- .Values.oscreds.mysql.tmf.existingSecret }}

{{- else }}

{{- include "openslice.fullname" . }}-mysql-tmf-secrets

{{- end }}

{{- end }}



{{- define "openslice.secrets.metrico.mysql" -}}

{{- if .Values.oscreds.mysql.metrico.existingSecret }}

{{- .Values.oscreds.mysql.metrico.existingSecret }}

kubernetes/helm/openslice/templates/mysql-tmf-secret.yaml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
{{- if not .Values.oscreds.mysql.tmf.existingSecret -}}

apiVersion: v1

kind: Secret

metadata:

  namespace: {{ .Release.Namespace }}

  labels:

    app: {{ include "openslice.fullname" . }}

    org.etsi.osl.service: mysql

    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"

    {{- include "openslice.labels" . | nindent 4 }}

  name: {{ include "openslice.fullname" . }}-mysql-tmf-secrets

data:

  username: {{ .Values.oscreds.mysql.tmf.username | default "tmfuser" | b64enc }}

  password: {{ .Values.oscreds.mysql.tmf.password | default "12345" | b64enc }}

  database: {{ .Values.oscreds.mysql.tmf.database | default "ostmfdb" | b64enc }}

{{- end -}}

kubernetes/helm/openslice/templates/mysql.yaml

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ spec: 
            - mountPath: "/var/run/secrets/portal"

              readOnly: true

              name: mysql-portal-secrets

            - mountPath: "/var/run/secrets/tmf"

              readOnly: true

              name: mysql-tmf-secrets

            - mountPath: "/var/run/secrets/keycloak"

              readOnly: true

              name: mysql-keycloak-secrets
@@ -92,6 +95,9 @@ spec: 
        - name: mysql-portal-secrets

          secret:

            secretName: {{ include "openslice.secrets.portal.mysql" . }}

        - name: mysql-tmf-secrets

          secret:

            secretName: {{ include "openslice.secrets.tmf.mysql" . }}

        - name: mysql-keycloak-secrets

          secret:

            secretName: {{ include "openslice.secrets.keycloak.mysql" . }}