Commit b4186291 authored by guillecxb's avatar guillecxb
Browse files

edit helm configmap for correct deploy

parent 112e7225

helm/capif/charts/ocf-helper/templates/ocf-helper-configmap.yaml

+23 −0
Original line number Diff line number Diff line
@@ -22,3 +22,26 @@ data: 
      "port": {{ quote .Values.env.vaultPort }},

      "token": {{ quote .Values.env.vaultAccessToken }}

    }



    capif_configuration: {

      'config_name': "{{ .Values.env.configName }}",

      'version': "{{ .Values.env.configVersion }}",

      'description': "{{ .Values.env.configDescription }}",

      'settings': {

        'certificates_expiry': {

          ttl_superadmin_cert: "{{ .Values.env.ttlSuperadminCert }}",

          ttl_invoker_cert: "{{ .Values.env.ttlInvokerCert }}",

          ttl_provider_cert: "{{ .Values.env.ttlProviderCert }}",

        },

        'security_method_priority': {

          oauth: "{{ .Values.env.oauthPriotity }}",

          pki: "{{ .Values.env.pkiPriority }}",

          psk: "{{ .Values.env.pskPriority }}"

        },

        'acl_policy_settings': {

          allowed_total_invocations: "{{ .Values.env.allowedTotalInvocations }}",

          allowed_invocations_per_second: "{{ .Values.env.allowedInvocationsPerSecond }}",

          allowed_invocation_time_range_days: "{{ .Values.env.allowedInvocationTimeRangeDays }}"

        }

      }

    }
 
 No newline at end of file

helm/capif/charts/ocf-helper/values.yaml

+12 −0
Original line number Diff line number Diff line
@@ -24,6 +24,18 @@ env: 
  mongoInitdbRootUsername: root

  mongoInitdbRootPassword: example

  logLevel: "INFO"

  configName: "default"

  configVersion: "1.0"

  configDescription: "Default CAPIF Configuration"

  ttlSuperadminCert: "4300h"

  ttlInvokerCert: "4300h"

  ttlProviderCert: "4300h"

  oauthPriotity: 1

  pkiPriority: 2

  pskPriority: 3

  allowedTotalInvocations: 5

  allowedInvocationsPerSecond: 10

  allowedInvocationTimeRangeDays: 365



serviceAccount:

  # Specifies whether a service account should be created

helm/capif/charts/ocf-register/templates/configmap.yaml

+12 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ data: 
      'password': 'example',

      'db': 'capif_users',

      'col': 'user',

      'col_capif_configuration': 'capif_configuration',

      'admins': 'admins',

      'host': '{{ .Values.env.mongoHost }}',

      'port': '{{ .Values.env.mongoPort }}'
@@ -29,3 +30,14 @@ data: 
      admin_users: {admin_user: "admin",

                admin_pass: "password123"}

    }



    capif_configuration: {

      config_name: "{{ .Values.env.configName }}",

      version: "{{ .Values.env.configVersion }}",

      description: "{{ .Values.env.configDescription }}",

      settings: {

        certificates_expiry: {

          ttl_superadmin_cert: "{{ .Values.env.ttlSuperadminCert }}",

        }

      }

    }

helm/capif/charts/ocf-register/values.yaml

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ env: 
  capifHostname: capif-test.example.int

  logLevel: "INFO"

  timeout: "30"

  configName: "default"

  configVersion: "1.0"

  configDescription: "Default Register Configuration"

  ttlSuperadminCert: "4300h"

  

serviceAccount:

  # Specifies whether a service account should be created

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py

+4 −4
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ class InternalServiceOps(Resource): 


        mycol = self.db.get_col_by_name(self.db.acls)



        # 🚨 Nueva Lógica: Recuperar configuración desde capif_configuration en MongoDB

        # Retrieve parameters from capif_configuration in MongoDB

        config_col = self.db.get_col_by_name("capif_configuration")

        capif_config = config_col.find_one({"config_name": "default"})



        if capif_config:

            settings = capif_config.get("settings", {}).get("acl_policy_settings", {})

            allowed_total_invocations = settings.get("allowedTotalInvocations", 100)

            allowed_invocations_per_second = settings.get("allowedInvocationsPerSecond", 10)

            time_range_days = settings.get("allowedInvocationTimeRangeDays", 365)

            allowed_total_invocations = settings.get("allowed_total_invocations", 100)

            allowed_invocations_per_second = settings.get("allowed_invocations_per_second", 10)

            time_range_days = settings.get("allowed_invocation_time_range_days", 365)

        else:

            current_app.logger.error("CAPIF Configuration not found, applying all values to 0.")

            allowed_total_invocations = 0