Commit bec5eccd authored by Yann Garcia's avatar Yann Garcia
Browse files

Merging InterDigital AdvantEDGE 'develop' branch into ETSI 'STF625_TASK4' branch - First round

parent eba50f12

.meepctl-repocfg.yaml

+19 −23
Original line number Original line Diff line number Diff line 
# Copyright (c) 2019-2022  InterDigital Communications, Inc

# Copyright (c) 2022  The AdvantEDGE Authors

#

#

# Licensed under the Apache License, Version 2.0 (the "License");

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# See the License for the specific language governing permissions and

# limitations under the License.

# limitations under the License.





version: 1.8.1

version: 1.8.2

repo:

repo:

  name: AdvantEDGE

  name: AdvantEDGE
@@ -38,7 +38,7 @@ repo: 
    # platform ingress configuration

    # platform ingress configuration

    ingress:

    ingress:

      # host name

      # host name

      host: mec-platform.etsi.org

      host: my-platform-fqdn

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

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

      https-only: false

      https-only: false

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

      # bind to host ports (true) or node ports (false)
@@ -48,9 +48,9 @@ repo: 
      # https config

      # https config

      https-port: 443

      https-port: 443

      # certificate authority (none|self-signed|lets-encrypt) default: none

      # certificate authority (none|self-signed|lets-encrypt) default: none

      ca: lets-encrypt

      ca: self-signed

      # lets-encrypt production server (true) or staging server (false)

      # lets-encrypt production server (true) or staging server (false)

      le-server-prod: true

      le-server-prod: false





    # authentication & authorization config

    # authentication & authorization config

    auth:

    auth:
@@ -73,7 +73,7 @@ repo: 
        # access token url

        # access token url

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

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

        # OAuth redirect URI

        # OAuth redirect URI

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

        redirect-uri: https://my-platform-fqdn/auth/v1/authorize

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

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

        secret: meep-oauth-github

        secret: meep-oauth-github

      # GitLab OAuth provider config

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

        # access token url

        token-url: https://gitlab.com/oauth/token

        token-url: https://gitlab.com/oauth/token

        # OAuth redirect URI

        # OAuth redirect URI

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

        redirect-uri: https://my-platform-fqdn/auth/v1/authorize

        # GitLab api url

        # GitLab api url

        # api-url: https://gitlab.com

        # api-url: https://gitlab.com

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

        # OAuth k8s secret (data: client-id, secret)
@@ -450,6 +450,7 @@ repo: 
          meep-mon-engine-api: js-packages/meep-mon-engine-client

          meep-mon-engine-api: js-packages/meep-mon-engine-client

          meep-gis-engine-api: js-packages/meep-gis-engine-client

          meep-gis-engine-api: js-packages/meep-gis-engine-client

          meep-auth-svc-client: js-packages/meep-auth-svc-client

          meep-auth-svc-client: js-packages/meep-auth-svc-client

          meep-metrics-engine-api: js-packages/meep-metrics-engine-client





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

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

  #  Sandbox Subsystem

  #  Sandbox Subsystem
@@ -889,7 +890,7 @@ repo: 
      # enable meepctl dockerize -> deps are never dockerized

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      dockerize: false

      # enable meepctl deploy/delete

      # enable meepctl deploy/delete

      deploy: true

      deploy: false

      # location of deployment chart

      # location of deployment chart

      chart: charts/cert-manager

      chart: charts/cert-manager

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

      # user supplied value file located @ .meep/user/values (use below file name)
@@ -1214,6 +1215,16 @@ repo: 
        src: go-packages/meep-users

        src: go-packages/meep-users

        # supports linting

        # supports linting

        lint: true

        lint: true

      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: true

      meep-wais-client:

      meep-wais-client:

        # location of source code

        # location of source code

        src: go-packages/meep-wais-client

        src: go-packages/meep-wais-client
@@ -1229,11 +1240,6 @@ repo: 
        src: go-packages/meep-websocket

        src: go-packages/meep-websocket

        # supports linting

        # supports linting

        lint: true

        lint: true

      meep-vis-client:

        # location of source code

        src: go-packages/meep-vis-client

        # supports linting

        lint: false

      meep-dai-client:

      meep-dai-client:

        # location of source code

        # location of source code

        src: go-packages/meep-dai-client

        src: go-packages/meep-dai-client
@@ -1242,11 +1248,6 @@ repo: 




    # Javascript Packages

    # Javascript Packages

    js-packages:

    js-packages:

      meep-app-support-client:

        # location of source code

        src: js-packages/meep-app-support-client

        # supports linting

        lint: false

      meep-auth-svc-client:

      meep-auth-svc-client:

        # location of source code

        # location of source code

        src: js-packages/meep-auth-svc-client

        src: js-packages/meep-auth-svc-client
@@ -1277,8 +1278,3 @@ repo: 
        src: js-packages/meep-sandbox-ctrl-client

        src: js-packages/meep-sandbox-ctrl-client

        # supports linting

        # supports linting

        lint: false
 
        lint: false
 
      meep-service-mgmt-client:

        # location of source code

        src: js-packages/meep-service-mgmt-client

        # supports linting

        lint: false

AUTHORS

0 → 100644
+14 −0
Original line number Original line Diff line number Diff line 
# This is the list of AdvantEDGE's significant contributors per release.

#

# This does not necessarily list everyone who has contributed code,

# especially since many employees of one corporation may be contributing.

# To see the full list of contributors, see the revision history in

# source control.



[v1.0.0 - v1.8.1]

InterDigital Communications Inc



[v1.9.0]

InterDigital Communications Inc

xFlow Research (Pvt.) Inc.

FSCOM

charts/meep-ams/templates/deployment.yaml

+0 −4
Original line number Original line Diff line number Diff line
@@ -31,10 +31,6 @@ spec: 
      containers:

      containers:

        - name: {{ .Chart.Name }}

        - name: {{ .Chart.Name }}

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

          {{- if .Values.codecov.enabled}}

          command: [ "/meep-ams" ]

          args: [ "-test.coverprofile=/codecov/codecov-meep-ams.out", "__DEVEL--code-cov" ]

          {{- end}}

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          ports:

          ports:

            - containerPort: {{ .Values.deployment.port }}

            - containerPort: {{ .Values.deployment.port }}

charts/meep-app-enablement/templates/codecov-pv.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ spec: 
    - ReadWriteOnce

    - ReadWriteOnce

  persistentVolumeReclaimPolicy: Retain

  persistentVolumeReclaimPolicy: Retain

  hostPath:

  hostPath:

    path: "/home/englab/.meep/codecov/meep-app-enablement"

    path:  {{ .Values.codecov.location }}





---

---

kind: StorageClass

kind: StorageClass

charts/meep-app-enablement/templates/deployment.yaml

+0 −4
Original line number Original line Diff line number Diff line
@@ -31,10 +31,6 @@ spec: 
      containers:

      containers:

        - name: {{ .Chart.Name }}

        - name: {{ .Chart.Name }}

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

          {{- if .Values.codecov.enabled}}

          command: [ "/meep-app-enablement" ]

          args: [ "-test.coverprofile=/codecov/codecov-meep-app-enablement.out", "__DEVEL--code-cov" ]

          {{- end}}

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          imagePullPolicy: {{ .Values.image.pullPolicy }}

          ports:

          ports:

            - containerPort: {{ .Values.deployment.port }}

            - containerPort: {{ .Values.deployment.port }}