Commit b4f21cf4 authored by Pantelis Malekas's avatar Pantelis Malekas
Browse files

fix: hook-onboard path and secrets

parent b09fc281

charts/hypo/templates/config/keycloak-secret.yaml

+6 −5
Changes for charts/hypo/templates/config/keycloak-secret.yaml: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -5,10 +5,11 @@ kind: Secret 
metadata:

  name: keycloak-db

stringData:

  admin_user: {{ .Values.keycloak.auth.adminUser | quote }}

  admin_password: {{ .Values.keycloak.auth.adminPassword | quote }}

  pg_host: {{ include "hypo.postgresql.url" . }}

  pg_port: {{ include "hypo.postgresql.port" . | quote }}

  pg_user: {{ $postgresqlDb.auth.username }}

  pg_database: KEYCLOAK

  password: {{ $postgresqlDb.auth.password }}

  # pg_host: {{ include "hypo.postgresql.url" . }}

  # pg_port: {{ include "hypo.postgresql.port" . | quote }}

  # pg_user: {{ $postgresqlDb.auth.username }}

  # pg_database: KEYCLOAK

  # pg_password: {{ $postgresqlDb.auth.password }}

{{- end -}}

charts/hypo/templates/tmf-api/workflow-hook.yaml

+1 −1
Changes for charts/hypo/templates/tmf-api/workflow-hook.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ spec: 
        {{- end }}

        - name: host_keycloak

          {{- if and .Values.keycloak.setup (eq .Values.installation "dev") }}

          value: http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}

          value: http://$(NODE_IP):{{ .Values.keycloak.service.httpNodePort }}/auth

          {{- else if and .Values.keycloak.setup (eq .Values.installation "prod") }}

          value: "https://auth.hyper-orchestrator.eu"

          {{ else }}

charts/hypo/values.yaml

+37 −2
Changes for charts/hypo/values.yaml: 37 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1297,7 +1297,9 @@ keycloak: 
  replicas: 1



  # Keep the existing PostgreSQL instance.

  # Temporary removed for Secret setup

  database:

    vendor: postgres

    existingSecret: keycloak-db



  # Expose Keycloak on the same NodePort as before.

  service:
@@ -1320,7 +1322,40 @@ keycloak: 
      readOnly: true



  # Keycloak's initial administrator.

  # Temporary removed for Secret setup

  extraEnv: |

    - name: KC_DB_URL_HOST

      valueFrom:

        secretKeyRef:

          name: keycloak-db

          key: pg_host



    - name: KC_DB_URL_PORT

      valueFrom:

        secretKeyRef:

          name: keycloak-db

          key: pg_port



    - name: KC_DB_URL_DATABASE

      valueFrom:

        secretKeyRef:

          name: keycloak-db

          key: pg_database



    - name: KC_DB_USERNAME

      valueFrom:

        secretKeyRef:

          name: keycloak-db

          key: pg_user

    - name: KEYCLOAK_ADMIN

      valueFrom:

        secretKeyRef:

          name: keycloak-db

          key: admin_user

    - name: KEYCLOAK_ADMIN_PASSWORD

      valueFrom:

        secretKeyRef:

          name: keycloak-db

          key: admin_password



  # Retain HypO-specific settings if other templates use them.

  auth:

scripts/add_ziti_controller.sh

+1 −1
Changes for scripts/add_ziti_controller.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ set -e 
# Get the VM IP (IP of the default route interface)

VM_IP=$(hostname -I | awk '{print $1}')



TOKEN_URL="http://${VM_IP}:30081/realms/tmf/protocol/openid-connect/token"

TOKEN_URL="http://${VM_IP}:30081/auth/realms/tmf/protocol/openid-connect/token"

API_URL="http://${VM_IP}:30095/fabric-api/network/controller"



echo "Detected VM IP: ${VM_IP}"

scripts/peering_dev.sh

+1 −1
Changes for scripts/peering_dev.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
NODE_IP=$(hostname -I | awk '{print $1}')

VAULT_ADDR="http://$NODE_IP:31084"



KEYCLOAK_URL="http://$NODE_IP:30081/realms/tmf/protocol/openid-connect/token"

KEYCLOAK_URL="http://$NODE_IP:30081/auth/realms/tmf/protocol/openid-connect/token"



response=$(curl -s -X POST "$KEYCLOAK_URL" \

  -H "Content-Type: application/x-www-form-urlencoded" \