Commit 5e89e9ab authored by Laurent Velez's avatar Laurent Velez
Browse files

Merge branch 'STF625' into 'master' 

Stf625ToMaster

See merge request mec/mec-sandbox!2
parents 5e0d69e8 0780bf94

README.md

+8 −6
Original line number Diff line number Diff line
@@ -193,8 +193,10 @@ MEC Sandbox has the following prerequisites: 
   - **NOTE:** Once the kubernetes secrets have been created, it is recommended to remove the config files containing the clear-text secrets

1. Build & Deploy AdvantEDGE:

   - For more details see [AdvantEDGE Deployment Workflow](https://interdigitalinc.github.io/AdvantEDGE/docs/platform-mgmt/mgmt-workflow/)

   - Build meepctl:

   - Build and Configure meepctl:

     - `~/AdvantEDGE/go-apps/meepctl/install.sh`

     - `meepctl config ip <VM private IP address>`

     - `meepctl config gitdir <full path to ~/AdvantEDGE>`

   - Deploy dependency pods:

     - `meepctl deploy dep`

   - Build & Dockerize:
@@ -213,7 +215,7 @@ Manage MEC Sandbox admin user accounts as follows: 
1. SSH into _meep-postgis-0_ pod

1. Login & connect to PostgreSQL user role database:

   - `psql -U postgres`

   - `\c meep_platform_ctrl`

   - `\c meep_auth_svc`

1. Add entry to give _admin_ rights to a specific username from a specific provider. Examples:

   - `INSERT INTO users (provider, username, password, sboxname, role) VALUES ('github', 'user1', '', 'sbx-user1','admin');`

   - `INSERT INTO users (provider, username, password, sboxname, role) VALUES ('gitlab', 'user2', '', 'sbx-user2','admin');`

config/.meepctl-repocfg.yaml

+49 −3
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ repo: 
  #  Core Subsystem

  #------------------------------

  core:



    # Go Applications

    go-apps:

      meep-auth-svc:
@@ -285,6 +284,7 @@ repo: 
          - meep-sandbox-ctrl

          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

        # location of API specifications

        api:

          - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -363,6 +363,7 @@ repo: 
          meep-tc-engine: charts/meep-tc-engine

          meep-app-enablement: charts/meep-app-enablement

          meep-virt-chart-templates: charts/meep-virt-chart-templates

          meep-vis: charts/meep-vis

        # list of sandbox specific pods

        sandbox-pods:

          - meep-gis-engine
@@ -375,6 +376,7 @@ repo: 
          - meep-sandbox-ctrl

          # - meep-tc-engine

          # - meep-app-enablement

          # - meep-vis

      meep-webhook:

        # location of source code

        src: go-apps/meep-webhook
@@ -427,7 +429,6 @@ repo: 
  #  Sandbox Subsystem

  #------------------------------

  sandbox:



    # Go Applications

    go-apps:

      meep-ams:
@@ -763,6 +764,42 @@ repo: 
        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-wais/entrypoint.sh

      meep-vis:

        # location of source code

        src: go-apps/meep-vis

        # location of binary

        bin: bin/meep-vis

        # location of deployment chart

        chart: charts/meep-vis

        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-vis.yaml

        # extra build flags

        build-flags:

          - -mod=vendor

        # enable meepctl build

        build: true

        # enable meepctl dockerize

        dockerize: true

        # enable meepctl deploy/delete

        deploy: true

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports linting

        lint: true

        # location of API specifications

        api:

          - name: 'AdvantEDGE V2X Information REST API'

            file: go-apps/meep-vis/api/swagger.yaml

        # location of user supplied API specifications

        user-api:

          - name: 'V2X Information Service REST API'

            file: config/api/vis-api.yaml

        # resources available to docker container image

        docker-data:

          # location of entry script

          'entrypoint.sh': go-apps/meep-vis/entrypoint.sh

          # location of grid map file

          'grid_map.yaml': go-packages/meep-vis-traffic-mgr/grid_map.yaml



  #------------------------------

  #  Dependencies
@@ -927,7 +964,6 @@ repo: 
  #  Packages

  #------------------------------

  packages:



    # Go Packages

    go-packages:

      meep-ams-client:
@@ -1095,6 +1131,16 @@ repo: 
        src: go-packages/meep-wais-client

        # supports linting

        lint: false

      meep-vis-client:

        # location of source code

        src: go-packages/meep-vis-client

        # supports linting

        lint: false

      meep-vis-traffic-mgr:

        # location of source code

        src: go-packages/meep-vis-traffic-mgr

        # supports linting

        lint: false

      meep-watchdog:

        # location of source code

        src: go-packages/meep-watchdog