Commit d6e4997b authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Merge branch 'staging' into OCFXX-Improve_local_config_yaml

parents 10d5d7d6 b401e3b0

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -37,3 +37,4 @@ results 


helm/capif/*.lock

helm/capif/charts/tempo*

*.bak
 
 No newline at end of file

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

+6 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ data: 
      'col_services': "serviceapidescriptions",

      'col_security': "security",

      'col_event': "eventsdetails",

      'col_capif_configuration': "capif_configuration",

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

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

    }
@@ -22,3 +23,7 @@ data: 
      "port": {{ quote .Values.env.vaultPort }},

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

    }



    {{- if .Values.capifConfiguration }}

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

    {{- end }}
 
 No newline at end of file

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

+18 −0
Original line number Diff line number Diff line
@@ -25,6 +25,24 @@ env: 
  mongoInitdbRootPassword: example

  logLevel: "INFO"



capifConfiguration:

  config_name: "default"

  config_version: "1.0"

  config_description: "Default CAPIF Configuration"

  settings:

    certificates_expiry:

      ttl_superadmin_cert: "4300h"

      ttl_invoker_cert: "4300h"

      ttl_provider_cert: "4300h"

    security_method_priority:

      oauth: 1

      pki: 2

      psk: 3

    acl_policy_settings:

      allowed_total_invocations: 5

      allowed_invocations_per_second: 10

      allowed_invocation_time_range_days: 365



serviceAccount:

  # Specifies whether a service account should be created

  create: true

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

+5 −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,7 @@ data: 
      admin_users: {admin_user: "admin",

                admin_pass: "password123"}

    }



    {{- if .Values.capifConfiguration }}

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

    {{- end }}

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

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,14 @@ env: 
  logLevel: "INFO"

  timeout: "30"



capifConfiguration:

  config_name: "default"

  config_version: "1.0"

  config_description: "Default Register Configuration"

  settings:

    certificates_expiry:

      ttl_superadmin_cert: "4300h"

  

serviceAccount:

  # Specifies whether a service account should be created

  create: true