Commit 48f1188c authored by Sergio Gimenez's avatar Sergio Gimenez
Browse files

fix: split federation manager config into configmap+secret

parent ea2e54a3

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

0 → 100644
+76 −0
Original line number Diff line number Diff line 
{{- if .Values.federationManager.enabled }}

apiVersion: v1

kind: ConfigMap

metadata:

  name: federation-manager-config

  namespace: {{ include "federation-manager.namespace" . }}

  labels:

    {{- include "federation-manager.fm.labels" . | nindent 4 }}

  {{- with .Values.commonAnnotations }}

  annotations:

    {{- toYaml . | nindent 4 }}

  {{- end }}

data:

  config.cfg: |

    [keycloak]

    client1_id = {{ .Values.federationManager.config.keycloak.client1_id }}

    client1_secret = ${CLIENT1_SECRET}

    client2_id = {{ .Values.federationManager.config.keycloak.client2_id }}

    client2_secret = ${CLIENT2_SECRET}

    scope = {{ .Values.federationManager.config.keycloak.scope }}

    host = {{ .Values.federationManager.config.keycloak.host }}

    port = {{ .Values.federationManager.config.keycloak.port }}

    realm = {{ .Values.federationManager.config.keycloak.realm }}



    [server]

    host = {{ .Values.federationManager.config.server.host }}

    port = {{ .Values.federationManager.config.server.port }}

    prefix = {{ .Values.federationManager.config.server.prefix }}

    version = {{ .Values.federationManager.config.server.version }}

    protocol = {{ .Values.federationManager.config.server.protocol }}



    [mongodb]

    host = {{ .Values.federationManager.config.mongodb.host }}

    port = {{ .Values.federationManager.config.mongodb.port }}



    [i2edge]

    host = {{ .Values.federationManager.config.i2edge.host }}

    port = {{ .Values.federationManager.config.i2edge.port }}



    [edge_cloud_platform]

    host = {{ .Values.federationManager.config.edgeCloudPlatform.host }}

    port = {{ .Values.federationManager.config.edgeCloudPlatform.port }}

    client_name = {{ .Values.federationManager.config.edgeCloudPlatform.client_name }}

    flavour_id = {{ .Values.federationManager.config.edgeCloudPlatform.flavour_id }}



    [artefact_manager]

    host = {{ .Values.federationManager.config.artefactManager.host }}

    port = {{ .Values.federationManager.config.artefactManager.port }}

    enabled = {{ .Values.federationManager.config.artefactManager.enabled }}

    dst_registry = {{ .Values.federationManager.config.artefactManager.dst_registry }}

    dst_username = {{ .Values.federationManager.config.artefactManager.dst_username }}

    dst_password = {{ .Values.federationManager.config.artefactManager.dst_password }}

    dst_token = {{ .Values.federationManager.config.artefactManager.dst_token }}



    [op_data]

    partnerOPFederationId = {{ .Values.federationManager.config.op_data.partnerOPFederationId }}

    partnerOPCountryCode = {{ .Values.federationManager.config.op_data.partnerOPCountryCode }}

    partnerOPMobileNetworkCode_MCC = {{ .Values.federationManager.config.op_data.partnerOPMobileNetworkCode_MCC }}

    partnerOPMobileNetworkCode_MNC = {{ .Values.federationManager.config.op_data.partnerOPMobileNetworkCode_MNC }}

    partnerOPFixedNetworkCode = {{ .Values.federationManager.config.op_data.partnerOPFixedNetworkCode }}

    platformCaps = {{ .Values.federationManager.config.op_data.platformCaps }}

    edgeDiscoveryServiceEndPoint_port = {{ .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_port }}

    edgeDiscoveryServiceEndPoint_fqdn = {{ .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_fqdn }}

    edgeDiscoveryServiceEndPoint_ipv4Addresses = {{ .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_ipv4Addresses }}

    edgeDiscoveryServiceEndPoint_ipv6Addresses = {{ .Values.federationManager.config.op_data.edgeDiscoveryServiceEndPoint_ipv6Addresses }}

    lcmServiceEndPoint_port = {{ .Values.federationManager.config.op_data.lcmServiceEndPoint_port }}

    lcmServiceEndPoint_fqdn = {{ .Values.federationManager.config.op_data.lcmServiceEndPoint_fqdn }}

    lcmServiceEndPoint_ipv4Addresses = {{ .Values.federationManager.config.op_data.lcmServiceEndPoint_ipv4Addresses }}

    lcmServiceEndPoint_ipv6Addresses = {{ .Values.federationManager.config.op_data.lcmServiceEndPoint_ipv6Addresses }}



    [partner_op]

    partner_op_host = {{ .Values.federationManager.config.partner_op.host }}

    partner_op_server = {{ .Values.federationManager.config.partner_op.server }}

    partner_op_port = {{ .Values.federationManager.config.partner_op.port }}

    role = {{ .Values.federationManager.config.partner_op.role }}

{{- end }}

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

+39 −3
Original line number Diff line number Diff line
@@ -25,6 +25,35 @@ spec: 
        {{- toYaml . | nindent 8 }}

      {{- end }}



      initContainers:

        - name: config-merge

          image: alpine:3.20

          imagePullPolicy: IfNotPresent

          command:

            - /bin/sh

            - -c

          args:

            - |

              apk add --no-cache gettext \

              && envsubst < /configmap/config.cfg > /work/config.cfg

          env:

            - name: CLIENT1_SECRET

              valueFrom:

                secretKeyRef:

                  name: federation-manager-secrets

                  key: client1_secret

            - name: CLIENT2_SECRET

              valueFrom:

                secretKeyRef:

                  name: federation-manager-secrets

                  key: client2_secret

          volumeMounts:

            - name: configmap

              mountPath: /configmap

              readOnly: true

            - name: config

              mountPath: /work



      containers:



        #####################################################################
@@ -63,7 +92,7 @@ spec: 
              protocol: TCP

          volumeMounts:

            - name: config

              readOnly: false

              readOnly: true

              mountPath: /usr/app/src/conf/

          resources:

            {{- toYaml .Values.federationManager.resources | nindent 12 }}
@@ -119,10 +148,17 @@ spec: 
      # VOLUME DEFINITIONS

      #######################################################################

      volumes:

        # Mount federation-manager config.yml

        - name: config

          emptyDir: {}



        - name: configmap

          configMap:

            name: federation-manager-config

            defaultMode: 420



        - name: secrets

          secret:

            secretName: federation-manager-config

            secretName: federation-manager-secrets

            defaultMode: 420



        # Keycloak realm import ConfigMap

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

+3 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
apiVersion: v1

kind: Secret

metadata:

  name: federation-manager-config

  name: federation-manager-secrets

  namespace: {{ include "federation-manager.namespace" . }}

  labels:

    {{- include "federation-manager.fm.labels" . | nindent 4 }}
@@ -12,5 +12,6 @@ metadata: 
  {{- end }}

type: Opaque

data:

  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.host .Values.federationManager.config.partner_op.server .Values.federationManager.config.partner_op.port .Values.federationManager.config.partner_op.role | b64enc }}

  client1_secret: {{ .Values.federationManager.config.keycloak.client1_secret | b64enc }}

  client2_secret: {{ .Values.federationManager.config.keycloak.client2_secret | b64enc }}

{{- end }}