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

Kostis Trantzasrequested to merge
58-check-the-differences-in-mysql-usage-in-docker-compose-vs-helm-chart into develop

Closes #58 (closed)

Merge request reports

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

+7 −0
Changes for kubernetes/helm/openslice/files/mysql-init/entrypoint.sh: 7 added lines, 0 removed lines.
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
Changes for kubernetes/helm/openslice/templates/_helpers.tpl: 8 added lines, 0 removed lines.
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
Changes for kubernetes/helm/openslice/templates/mysql-tmf-secret.yaml: 16 added lines, 0 removed lines.
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
Changes for kubernetes/helm/openslice/templates/mysql.yaml: 6 added lines, 0 removed lines.
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" . }}

kubernetes/helm/openslice/templates/oasapi.yaml

+6 −6
Changes for kubernetes/helm/openslice/templates/oasapi.yaml: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ spec: 
      - name: init-keycloak

        image: busybox:1.28

        command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-keycloak; do echo waiting for keycloak; sleep 2; done"]

      - name: init-mysql-portal

      - name: init-mysql

        image: busybox:1.28

        command: ['sh', '-c', "until nslookup {{ include "openslice.fullname" . }}-mysql; do echo waiting for mysql; sleep 2; done"]

      hostNetwork: {{ .Values.hostNetwork }}
@@ -42,7 +42,7 @@ spec: 
                {

                  "origins":"{{ .Values.rooturl }}",

                  "spring.config.import": "configtree:/etc/config/",

                  "spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/{{ .Values.oscreds.mysql.portal.database }}",

                  "spring.datasource.url": "jdbc:mysql://{{ include "openslice.fullname" . }}-mysql/{{ .Values.oscreds.mysql.tmf.database }}",

                  "spring-addons.issuers[0].uri": "{{ .Values.rooturl }}/auth/realms/openslice",

                  "spring-addons.issuers[0].username-json-path":"$.preferred_username", 

                  "spring-addons.issuers[0].claims[0].jsonPath":"$.realm_access.roles",
@@ -65,11 +65,11 @@ spec: 
              port: 13101

          volumeMounts:

            - mountPath: "/etc/config/spring.datasource.username"

              name: mysql-portal-secrets

              name: mysql-tmf-secrets

              subPath: username

              readOnly: true

            - mountPath: "/etc/config/spring.datasource.password"

              name: mysql-portal-secrets

              name: mysql-tmf-secrets

              subPath: password

              readOnly: true

            - mountPath: "/etc/config/spring.activemq.user"
@@ -85,9 +85,9 @@ spec: 
        - name: artemis-secrets

          secret:

            secretName: {{ include "openslice.secrets.activemq" . }}

        - name: mysql-portal-secrets

        - name: mysql-tmf-secrets

          secret:

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

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

---

apiVersion: v1

kind: Service