Commit 09e0aa8f authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'STF678' into 'STF678_MEC011' 

# Conflicts:
#   config/api/app-support.yaml
#   config/api/service-mgmt.yaml
parents 0f8fc948 ead43a1c

config/.meepctl-repocfg.yaml

+11 −11
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ repo: 
    # platform ingress configuration

    ingress:

      # host name

      host: try-mec.etsi.org

      host: mec-platform.etsi.org

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

      https-only: true

      # bind to host ports (true) or node ports (false)
@@ -67,13 +67,13 @@ repo: 
      # GitHub OAuth provider config

      github:

        # enable GitHub OAuth

        enabled: truee

        enabled: true

        # authorization url

        auth-url: https://github.com/login/oauth/authorize

        # access token url

        token-url: https://github.com/login/oauth/access_token

        # OAuth redirect URI

        redirect-uri: https://try-mec.etsi.org/platform-ctrl/v1/authorize

        redirect-uri: https://mec-platform.etsi.org/platform-ctrl/v1/authorize

        # OAuth k8s secret (data: client-id, secret)

        secret: meep-oauth-github

      # GitLab OAuth provider config
@@ -85,7 +85,7 @@ repo: 
        # access token url

        token-url: https://forge.etsi.org/rep/oauth/token

        # OAuth redirect URI

        redirect-uri: https://try-mec.etsi.org/platform-ctrl/v1/authorize

        redirect-uri: https://mec-platform.etsi.org/platform-ctrl/v1/authorize

        # GitLab api url

        api-url: https://forge.etsi.org/rep/api/v4

        # OAuth k8s secret (data: client-id, secret)
@@ -98,7 +98,7 @@ repo: 
        # enable influx data backups

        enabled: true

        # object store url

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

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

        # object store configuration secret

        secret: meep-influx-objstore-config

        # Number of days to retain daily data backups
@@ -114,11 +114,11 @@ repo: 
          # prometheus environment (dev|prod)

          promenv: prod

          # unique deployment identifier

          replica: platform-ip

          replica: 172.29.10.52

      # Thanos long-term storage

      thanos:

        # enable Thanos

        enabled: true

        enabled: false

        # object store configuration secret

        secret: meep-thanos-objstore-config

        # query component
@@ -148,7 +148,7 @@ repo: 
      # Thanos long-term storage archive

      thanos-archive:

        # enable Thanos archive

        enabled: true

        enabled: false

        # archive object store configuration secret

        secret: meep-thanos-archive-objstore-config
@@ -836,11 +836,11 @@ repo: 
        build-flags:

          - -mod=vendor

        # enable meepctl build

        build: true

        build: false

        # enable meepctl dockerize

        dockerize: true

        dockerize: false

        # enable meepctl deploy/delete

        deploy: true

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports onboarded device application instantiation

config/api/app-support.yaml

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ tags: 
  - name: mec_app_support

  - name: unsupported

  - name: callbacks

servers:

  - url: 'https://localhost/sandboxname/mec_app_support/v2'

    variables: {}

paths:

  /applications/{appInstanceId}/traffic_rules:

    get: