Commit 1e94ad6b authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Fixed config maps

parent ebbbdc49

helm/04_capif_services/charts/ocf-api-invoker-management/templates/configmap.yaml

+30 −34
Original line number Diff line number Diff line
@@ -4,40 +4,36 @@ metadata: 
  name: capif-invoker-configmap

data:

  config.yaml: |

    mongo: {

      'user': '{{ .Values.env.mongoInitdbRootUsername }}',

      'password': '{{ .Values.env.mongoInitdbRootPassword }}',

      'db': 'capif',

      'col': 'invokerdetails',

      'capif_users_col': 'user',

      'certs_col': 'certs',

      'service_col': 'serviceapidescriptions',

      'host': 'mongo',

      'port': "27017"

    }

    mongo:

      user: '{{ .Values.env.mongoInitdbRootUsername }}'

      password: '{{ .Values.env.mongoInitdbRootPassword }}'

      db: capif

      col: invokerdetails

      capif_users_col: user

      certs_col: certs

      service_col: serviceapidescriptions

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

      port: '{{ .Values.env.mongoPort }}'



    mongo_register: {

      'user': '{{ .Values.env.mongoRegister.mongoInitdbRootUsername }}',

      'password': '{{ .Values.env.mongoRegister.mongoInitdbRootPassword }}',

      'db': 'capif_users',

      'col': 'user',

      'host': 'mongo-register',

      'port': '27017'

    }

    mongo_register:

      user: '{{ .Values.env.mongoRegister.mongoInitdbRootUsername }}'

      password: '{{ .Values.env.mongoRegister.mongoInitdbRootPassword }}'

      db: 'capif_users'

      col: 'user'

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

      port: '{{ .Values.env.mongoRegister.mongoPort }}'

    

    ca_factory: {

      "url": !ENV ${VAULT_HOSTNAME},

      "port": !ENV ${VAULT_PORT},

      "token": !ENV ${VAULT_ACCESS_TOKEN}

    }

    ca_factory:

      url: !ENV "${VAULT_HOSTNAME}"

      port: !ENV "${VAULT_PORT}"

      token: !ENV "${VAULT_ACCESS_TOKEN}"



    monitoring: {

      "fluent_bit_host": fluent-bit,

      "fluent_bit_port": 24224,

      "opentelemetry_url": "otel-collector",

      "opentelemetry_port": "55680",

      "opentelemetry_max_queue_size": 8192,

      "opentelemetry_schedule_delay_millis": 20000,

      "opentelemetry_max_export_batch_size": 2048,

      "opentelemetry_export_timeout_millis": 60000

    }
 
 No newline at end of file
 
    monitoring:

      fluent_bit_host: fluent-bit

      fluent_bit_port: 24224

      opentelemetry_url: otel-collector

      opentelemetry_port: 55680

      opentelemetry_max_queue_size: 8192

      opentelemetry_schedule_delay_millis: 20000

      opentelemetry_max_export_batch_size: 2048

      opentelemetry_export_timeout_millis: 60000
 
 No newline at end of file

helm/04_capif_services/charts/ocf-api-invoker-management/values.yaml

+4 −0
Original line number Diff line number Diff line
@@ -20,12 +20,16 @@ env: 
  vaultHostname: vault

  vaultPort: 8200

  vaultAccessToken: dev-only-token

  mongoHost: mongo

  mongoPort: 27017

  mongoInitdbRootUsername: root

  mongoInitdbRootPassword: example

  logLevel: "INFO"

  mongoRegister:

    mongoInitdbRootUsername: root

    mongoInitdbRootPassword: example

    mongoHost: mongo-register

    mongoPort: 27017



serviceAccount:

  # Specifies whether a service account should be created

helm/04_capif_services/charts/ocf-api-provider-management/templates/configmap.yaml

+29 −33
Original line number Diff line number Diff line
@@ -4,39 +4,35 @@ metadata: 
  name: capif-provider-configmap

data:

  config.yaml: |

    mongo: {

      'user': '{{ .Values.env.mongoInitdbRootUsername }}',

      'password': '{{ .Values.env.mongoInitdbRootPassword }}',

      'db': 'capif',

      'col': 'providerenrolmentdetails',

      'certs_col': 'certs',

      'capif_users': 'user',

      'host': 'mongo',

      'port': "27017"

    }

    mongo:

      user: '{{ .Values.env.mongoInitdbRootUsername }}'

      password: '{{ .Values.env.mongoInitdbRootPassword }}'

      db: 'capif'

      col: 'providerenrolmentdetails'

      certs_col: 'certs'

      capif_users: 'user'

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

      port: '{{ .Values.env.mongoPort }}'



    mongo_register: {

      'user': '{{ .Values.env.mongoRegister.mongoInitdbRootUsername }}',

      'password': '{{ .Values.env.mongoRegister.mongoInitdbRootPassword }}',

      'db': 'capif_users',

      'col': 'user',

      'host': 'mongo-register',

      'port': '27017'

    }

    mongo_register:

      user: '{{ .Values.env.mongoRegister.mongoInitdbRootUsername }}'

      password: '{{ .Values.env.mongoRegister.mongoInitdbRootPassword }}'

      db: 'capif_users'

      col: 'user'

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

      port: '{{ .Values.env.mongoRegister.mongoPort }}'



    ca_factory: {

      "url": !ENV ${VAULT_HOSTNAME},

      "port": !ENV ${VAULT_PORT},

      "token": !ENV ${VAULT_ACCESS_TOKEN}

    }

    ca_factory:

      url: !ENV "${VAULT_HOSTNAME}"

      port: !ENV "${VAULT_PORT}"

      token: !ENV "${VAULT_ACCESS_TOKEN}"



    monitoring: {

      "fluent_bit_host": fluent-bit,

      "fluent_bit_port": 24224,

      "opentelemetry_url": "otel-collector",

      "opentelemetry_port": "55680",

      "opentelemetry_max_queue_size": 8192,

      "opentelemetry_schedule_delay_millis": 20000,

      "opentelemetry_max_export_batch_size": 2048,

      "opentelemetry_export_timeout_millis": 60000

    }
 
 No newline at end of file
 
    monitoring:

      fluent_bit_host: fluent-bit

      fluent_bit_port: 24224

      opentelemetry_url: otel-collector

      opentelemetry_port: 55680

      opentelemetry_max_queue_size: 8192

      opentelemetry_schedule_delay_millis: 20000

      opentelemetry_max_export_batch_size: 2048

      opentelemetry_export_timeout_millis: 60000

helm/04_capif_services/charts/ocf-api-provider-management/values.yaml

+4 −0
Original line number Diff line number Diff line
@@ -20,12 +20,16 @@ env: 
  vaultHostname: vault

  vaultPort: 8200

  vaultAccessToken: dev-only-token

  mongoHost: mongo

  mongoPort: 27017

  mongoInitdbRootUsername: root

  mongoInitdbRootPassword: example

  logLevel: "INFO"

  mongoRegister:

    mongoInitdbRootUsername: root

    mongoInitdbRootPassword: example

    mongoHost: mongo-register

    mongoPort: 27017



serviceAccount:

  # Specifies whether a service account should be created

helm/04_capif_services/charts/ocf-helper/templates/ocf-helper-configmap.yaml

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ data: 
      token: !ENV "${VAULT_ACCESS_TOKEN}"



    {{- if .Values.capifConfiguration }}

    capif_configuration:

{{ .Values.capifConfiguration | toYaml | nindent 6 }}

    capif_configuration: {{ .Values.capifConfiguration | toYaml | nindent 6 }}

    {{- end }}



    package_paths: