Commit 5f2eb7e5 authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

fix: complete federation manager config defaults

parent f3b630e5

oop-platform-chart/charts/federation-manager/templates/federation-manager-deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ spec: 
            - name: KC_IMPORT

              value: /opt/keycloak/data/import/realm-import.json

          ports:

            - name: http

            - name: keycloak-http

              containerPort: 8080

              protocol: TCP

          volumeMounts:

oop-platform-chart/charts/federation-manager/templates/federation-manager-secret.yaml

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ metadata: 
  {{- end }}

type: Opaque

data:

  config.cfg: {{ printf "[keycloak]\nclient1_id = %s\nclient1_secret = %s\nclient2_id = %s\nclient2_secret = %s\nscope = %s\n\n[server]\nhost = %s\nport = %s\nprefix = %s\nversion = %s\nprotocol = %s\n\n[mongodb]\nhost = %s\nport = %s\n\n[i2edge]\nhost = %s\nport = %s\n\n[op_data]\npartnerOPFederationId = %s\npartnerOPCountryCode = %s\npartnerOPMobileNetworkCode_MCC = %s\npartnerOPMobileNetworkCode_MNC = %s\npartnerOPFixedNetworkCode = %s\nplatformCaps = %s\nedgeDiscoveryServiceEndPoint_port = %s\nedgeDiscoveryServiceEndPoint_fqdn = %s\nedgeDiscoveryServiceEndPoint_ipv4Addresses = %s\nedgeDiscoveryServiceEndPoint_ipv6Addresses = %s\nlcmServiceEndPoint_port = %s\nlcmServiceEndPoint_fqdn = %s\nlcmServiceEndPoint_ipv4Addresses = %s\nlcmServiceEndPoint_ipv6Addresses = %s\n\n[partner_op]\npartner_op_host = %s\npartner_op_server = %s\npartner_op_port = %s\nrole = %s\n" .Values.federationManager.config.keycloak.client1_id .Values.federationManager.config.keycloak.client1_secret .Values.federationManager.config.keycloak.client2_id .Values.federationManager.config.keycloak.client2_secret .Values.federationManager.config.keycloak.scope .Values.federationManager.config.server.host .Values.federationManager.config.server.port .Values.federationManager.config.server.prefix .Values.federationManager.config.server.version .Values.federationManager.config.server.protocol .Values.federationManager.config.mongodb.host .Values.federationManager.config.mongodb.port .Values.federationManager.config.i2edge.host .Values.federationManager.config.i2edge.port .Values.federationManager.config.op_data.partnerOPFederationId .Values.federationManager.config.op_data.partnerOPCountryCode .Values.federationManager.config.op_data.partnerOPMobileNetworkCode_MCC .Values.federationManager.config.op_data.partnerOPMobileNetworkCode_MNC .Values.federationManager.config.op_data.partnerOPFixedNetworkCode .Values.federationManager.config.op_data.platformCaps .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_port .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_fqdn .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_ipv4Addresses .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_ipv6Addresses .Values.federationManager.config.op_data.lcmServiceEndPoint_port .Values.federationManager.config.op_data.lcmServiceEndPoint_fqdn .Values.federationManager.config.op_data.lcmServiceEndPoint_ipv4Addresses .Values.federationManager.config.op_data.lcmServiceEndPoint_ipv6Addresses .Values.federationManager.config.partner_op.host .Values.federationManager.config.partner_op.server .Values.federationManager.config.partner_op.port .Values.federationManager.config.partner_op.role | b64enc }}

  config.cfg: {{ printf "[keycloak]\nclient1_id = %s\nclient1_secret = %s\nclient2_id = %s\nclient2_secret = %s\nscope = %s\nhost = %s\nport = %s\nrealm = %s\n\n[server]\nhost = %s\nport = %s\nprefix = %s\nversion = %s\nprotocol = %s\n\n[mongodb]\nhost = %s\nport = %s\n\n[i2edge]\nhost = %s\nport = %s\n\n[edge_cloud_platform]\nhost = %s\nport = %s\nclient_name = %s\nflavour_id = %s\n\n[artefact_manager]\nhost = %s\nport = %s\nenabled = %s\ndst_registry = %s\ndst_username = %s\ndst_password = %s\ndst_token = %s\n\n[op_data]\npartnerOPFederationId = %s\npartnerOPCountryCode = %s\npartnerOPMobileNetworkCode_MCC = %s\npartnerOPMobileNetworkCode_MNC = %s\npartnerOPFixedNetworkCode = %s\nplatformCaps = %s\nedgeDiscoveryServiceEndPoint_port = %s\nedgeDiscoveryServiceEndPoint_fqdn = %s\nedgeDiscoveryServiceEndPoint_ipv4Addresses = %s\nedgeDiscoveryServiceEndPoint_ipv6Addresses = %s\nlcmServiceEndPoint_port = %s\nlcmServiceEndPoint_fqdn = %s\nlcmServiceEndPoint_ipv4Addresses = %s\nlcmServiceEndPoint_ipv6Addresses = %s\n\n[partner_op]\npartner_op_host = %s\npartner_op_server = %s\npartner_op_port = %s\nrole = %s\n" .Values.federationManager.config.keycloak.client1_id .Values.federationManager.config.keycloak.client1_secret .Values.federationManager.config.keycloak.client2_id .Values.federationManager.config.keycloak.client2_secret .Values.federationManager.config.keycloak.scope .Values.federationManager.config.keycloak.host .Values.federationManager.config.keycloak.port .Values.federationManager.config.keycloak.realm .Values.federationManager.config.server.host .Values.federationManager.config.server.port .Values.federationManager.config.server.prefix .Values.federationManager.config.server.version .Values.federationManager.config.server.protocol .Values.federationManager.config.mongodb.host .Values.federationManager.config.mongodb.port .Values.federationManager.config.i2edge.host .Values.federationManager.config.i2edge.port .Values.federationManager.config.edgeCloudPlatform.host .Values.federationManager.config.edgeCloudPlatform.port .Values.federationManager.config.edgeCloudPlatform.client_name .Values.federationManager.config.edgeCloudPlatform.flavour_id .Values.federationManager.config.artefactManager.host .Values.federationManager.config.artefactManager.port .Values.federationManager.config.artefactManager.enabled .Values.federationManager.config.artefactManager.dst_registry .Values.federationManager.config.artefactManager.dst_username .Values.federationManager.config.artefactManager.dst_password .Values.federationManager.config.artefactManager.dst_token .Values.federationManager.config.op_data.partnerOPFederationId .Values.federationManager.config.op_data.partnerOPCountryCode .Values.federationManager.config.op_data.partnerOPMobileNetworkCode_MCC .Values.federationManager.config.op_data.partnerOPMobileNetworkCode_MNC .Values.federationManager.config.op_data.partnerOPFixedNetworkCode .Values.federationManager.config.op_data.platformCaps .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_port .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_fqdn .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_ipv4Addresses .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_ipv6Addresses .Values.federationManager.config.op_data.lcmServiceEndPoint_port .Values.federationManager.config.op_data.lcmServiceEndPoint_fqdn .Values.federationManager.config.op_data.lcmServiceEndPoint_ipv4Addresses .Values.federationManager.config.op_data.lcmServiceEndPoint_ipv6Addresses .Values.federationManager.config.partner_op.partner_op_host .Values.federationManager.config.partner_op.partner_op_server .Values.federationManager.config.partner_op.partner_op_port .Values.federationManager.config.partner_op.role | b64enc }}

{{- end }}

oop-platform-chart/charts/federation-manager/templates/mongodb-pv.yaml

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ spec: 
  persistentVolumeReclaimPolicy: Retain

  storageClassName: {{ .Values.mongodb.persistence.storageClass | default "mongodb-fm-storage" }}

  hostPath:

    path: {{ .Values.mongodb.persistence.hostPath | default "/mnt/data/mongodb_fm" }}

    path: {{ default "/mnt/data/mongodb_fm" .Values.mongodb.persistence.hostPath.path }}

    type: DirectoryOrCreate

{{- end }}

oop-platform-chart/charts/federation-manager/values.yaml

+21 −1
Original line number Diff line number Diff line
@@ -95,7 +95,9 @@ mongodb: 
    accessMode: ReadWriteOnce

    size: 1Gi

    storageClass: "mongodb-fm-storage"

    hostPath: /mnt/data/mongodb_fm

    hostPath:

      enabled: true

      path: /mnt/data/mongodb_fm



  resources:

    limits:
@@ -140,6 +142,9 @@ federationManager: 
      client2_id: "originating-op-2"

      client2_secret: "2mhznERfWclLDuVojY77Lp4Qd2r4e8Ms"

      scope: "fed-mgmt"

      host: "keycloak"

      port: "8080"

      realm: "federation"



    server:

      host: "127.0.0.1"
@@ -157,6 +162,21 @@ federationManager: 
      host: "192.168.123.237"

      port: "30760"



    edgeCloudPlatform:

      host: "127.0.0.1"

      port: "30499"

      client_name: "federation-manager"

      flavour_id: "flavour1"



    artefactManager:

      host: "127.0.0.1"

      port: "30499"

      enabled: "true"

      dst_registry: ""

      dst_username: ""

      dst_password: ""

      dst_token: ""



    op_data:

      partnerOPFederationId: "i2cat"

      partnerOPCountryCode: "ES"