Commit 729d26bb authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Merge branch 'master' into STF678_Task_5_TTF_T043

parents 14ec45b2 b2a4a661

.meepctl-repocfg.yaml

+28 −13
Changes for .meepctl-repocfg.yaml: 28 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


version: 1.10.0

repo:

  name: AdvantEDGE

  name: etsi-mec-sandbox



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

  #  Deployment
@@ -23,9 +23,9 @@ repo: 
    # permissions

    permissions:

      # user id

      uid: 1000

      uid: 1001

      # group id

      gid: 1000

      gid: 1001



    # user supplied resources

    user:
@@ -40,7 +40,7 @@ repo: 
      # host name

      host: try-mec.etsi.org

      # enable https only (redirect http requests to https port)

      https-only: false

      https-only: true

      # bind to host ports (true) or node ports (false)

      host-ports: true

      # http port number
@@ -102,7 +102,7 @@ repo: 
      # Influx configuration

      influx:

        # enable influx data backups

        enabled: false

        enabled: true

        # object store url

        url: https://metrics.try-mec.etsi.org/

        # object store configuration secret
@@ -120,11 +120,11 @@ repo: 
          # prometheus environment (dev|prod)

          promenv: prod

          # unique deployment identifier

          replica: platform-ip

          replica: 172.29.10.56

      # Thanos long-term storage

      thanos:

        # enable Thanos

        enabled: false

        enabled: true

        # object store configuration secret

        secret: meep-thanos-objstore-config

        # query component
@@ -568,7 +568,7 @@ repo: 
            file: go-apps/meep-app-enablement/api/app-support/swagger.yaml

          - name: 'AdvantEDGE MEC Service Management REST API'

            file: go-apps/meep-app-enablement/api/service-mgmt/swagger.yaml

          - name: 'AdvantEDGE MEC service management realized by CAPIF APIs'

          - name: 'AdvantEDGE MEC Service management realized by CAPIF APIs'

            file: go-apps/meep-app-enablement/api/capif-mgmt/swagger.yaml

        # location of user supplied API specifications

        user-api:
@@ -576,7 +576,7 @@ repo: 
            file: config/api/app-support.yaml

          - name: 'MEC Service Management API'

            file: config/api/service-mgmt.yaml

          - name: 'MEC Capif Management API'

          - name: 'MEC CAPIF Management API'

            file: config/api/capif-mgmt.yaml

        # resources available to docker container image

        docker-data:
@@ -1288,7 +1288,7 @@ repo: 
      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: false

      deploy: true

      # location of deployment chart

      chart: charts/thanos

      # user supplied value file located @ .meep/user/values (use below file name)
@@ -1299,7 +1299,7 @@ repo: 
      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: false

      deploy: true

      # location of deployment chart

      chart: charts/thanos

      # user supplied value file located @ .meep/user/values (use below file name)
@@ -1508,7 +1508,7 @@ repo: 
        lint: false

      meep-vis-client:

        # location of source code

        src: go-packages/meep-vis-client

        src: go-packages/meep-dai-client

        # supports linting

        lint: false

      meep-iot-client:
@@ -1528,7 +1528,7 @@ repo: 
        lint: false

      meep-vis-traffic-mgr:

        # location of source code

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

        src: go-packages/meep-dai-mgr

        # supports linting

        lint: false

      meep-iot-mgr:
@@ -1536,6 +1536,21 @@ repo: 
        src: go-packages/meep-iot-mgr

        # supports linting

        lint: false

      meep-vis-client:

        # location of source code

        src: go-packages/meep-vis-client

        # supports linting

        lint: false

      meep-federation-mgr:

        # location of source code

        src: go-packages/meep-federation-mgr

        # 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

charts/docker-registry/values.yaml

+2 −2
Changes for charts/docker-registry/values.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -161,8 +161,8 @@ configData: 


securityContext:

  enabled: true

  runAsUser: 1000

  fsGroup: 1000

  runAsUser: 1001

  fsGroup: 1001



priorityClassName: ""

config/permissions-open.yaml

+2 −2
Changes for config/permissions-open.yaml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ default: 
#   #------------------------------

#   - name: 'meep-app-enablement'

#     api: 'mec_app_support'

#     path: '/mec_app_support/v2'

#     path: '/mec_app_support/v1'

#     sbox: true

#     default:

#       mode: 'allow'
@@ -276,7 +276,7 @@ default: 
#   #  Location Service (Sbox)

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

#   - name: 'meep-loc-serv'

#     path: '/location/v3'

#     path: '/location/v2'

#     sbox: true

#     default:

#       mode: 'allow'

config/permissions-secure.yaml

+2 −13
Changes for config/permissions-secure.yaml: 2 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ services: 
  #------------------------------

  - name: 'meep-app-enablement'

    api: 'mec_app_support'

    path: '/mec_app_support/v2'

    path: '/mec_app_support/v1'

    sbox: true

    default:

      mode: 'verify'
@@ -191,7 +191,7 @@ services: 
  #  Location Service (Sbox)

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

  - name: 'meep-loc-serv'

    path: '/location/v3'

    path: '/location/v2'

    sbox: true

    default:

      mode: 'verify'
@@ -254,17 +254,6 @@ services: 
        admin: 'allow'

        user: 'allow'

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

  #  FED Service (Sbox)

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

  - name: 'meep-federation'

    path: '/fed_enablement/v1'

    sbox: true

    default:

      mode: 'verify'

      roles:

        admin: 'allow'

        user: 'allow'

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

  #  DAI (Sbox)

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

  - name: 'meep-dai'

etsi-mec-sandbox-frontend @ 14e4658a

Compare bfefda15 to 14e4658a
Changes for etsi-mec-sandbox-frontend: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
Subproject commit bfefda152a337a4560081e343952da3c61d1411d
 
Subproject commit 14e4658a805a66b5dd2528c77806f3199a500690