Commit 59f100d7 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Fixed helms to be allow deploy on HIVE envionment

parent e0fc8fc3

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

+5 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ data: 
      'host': 'mongo',

      'port': "27017"

    }



    mongo_register: {

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

      'password': '{{ .Values.env.mongoRegister.mongoInitdbRootPassword }}',
@@ -23,10 +24,11 @@ data: 
      'host': 'mongo-register',

      'port': '27017'

    }

    

    ca_factory: {

      "url": {{ quote .Values.env.vaultHostname }},

      "port": {{ quote .Values.env.vaultPort }},

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

      "url": !ENV ${VAULT_HOSTNAME},

      "port": !ENV ${VAULT_PORT},

      "token": !ENV ${VAULT_ACCESS_TOKEN}

    }



    monitoring: {

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

+5 −4
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ data: 
      'host': 'mongo',

      'port': "27017"

    }



    mongo_register: {

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

      'password': '{{ .Values.env.mongoRegister.mongoInitdbRootPassword }}',
@@ -22,13 +23,13 @@ data: 
      'host': 'mongo-register',

      'port': '27017'

    }



    ca_factory: {

      "url": {{ quote .Values.env.vaultHostname }},

      "port": {{ quote .Values.env.vaultPort }},

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

      "url": !ENV ${VAULT_HOSTNAME},

      "port": !ENV ${VAULT_PORT},

      "token": !ENV ${VAULT_ACCESS_TOKEN}

    }





    monitoring: {

      "fluent_bit_host": fluent-bit,

      "fluent_bit_port": 24224,

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

+8 −3
Original line number Diff line number Diff line
@@ -14,14 +14,15 @@ data: 
      'col_security': "security",

      'col_event': "eventsdetails",

      'col_capif_configuration': "capif_configuration",

      'col_interconnected': "interconnected",

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

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

    }



    ca_factory: {

      "url": {{ quote .Values.env.vaultHostname }},

      "port": {{ quote .Values.env.vaultPort }},

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

      "url": !ENV ${VAULT_HOSTNAME},

      "port": !ENV ${VAULT_PORT},

      "token": !ENV ${VAULT_ACCESS_TOKEN},

    }



    {{- if .Values.capifConfiguration }}
@@ -37,6 +38,10 @@ data: 
        "path": "/configuration",

        "openapi_file": "configuration/openapi/openapi.yaml"

      },

      "interconnection_api": {

        "path": "/interconnection",

        "openapi_file": "interconnection/openapi/openapi.yaml"

      },

      "visibility_control": {

        "path": "/visibility-control",

        "openapi_file": "visibility_control/openapi/openapi.yaml"

helm/04_capif_services/charts/ocf-publish-service-api/templates/configmap.yaml

+8 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ data: 
      'col': 'serviceapidescriptions',

      'certs_col': 'certs',

      'capif_provider_col': 'providerenrolmentdetails',

      'col_interconnected': 'interconnected',

      'col_capif_configuration': 'capif_configuration',

      'host': 'mongo',

      'port': "27017"

    }
@@ -25,3 +27,9 @@ data: 
      "opentelemetry_max_export_batch_size": 2048,

      "opentelemetry_export_timeout_millis": 60000

    }

    

    ca_factory: {

      "url": !ENV ${VAULT_HOSTNAME},

      "port": !ENV ${VAULT_PORT},

      "token": !ENV ${VAULT_ACCESS_TOKEN},

    }
 
 No newline at end of file

helm/04_capif_services/charts/ocf-publish-service-api/templates/deployment.yaml

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ spec: 
              value: {{ quote .Values.env.monitoring }}

            - name: CAPIF_HOSTNAME

              value: {{ quote .Values.env.capifHostname }}

            - name: VAULT_HOSTNAME

              value: {{ quote .Values.env.vaultHostname }}

            - name: VAULT_PORT

              value: {{ quote .Values.env.vaultPort }}

            - name: VAULT_ACCESS_TOKEN

              value: {{ quote .Values.env.vaultAccessToken }}

            - name: LOG_LEVEL

              value: {{ quote .Values.env.logLevel }}

          livenessProbe: