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

Merge branch 'STF625_MEC030' into 'master' 

Stf625 Merge in Master

See merge request mec/AdvantEDGE!8
parents f203f7ab b2b7a6b4

.meepctl-repocfg.yaml

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

    ingress:

      # host name

      host: my-platform-fqdn

      host: mec-platform.etsi.org

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

      https-only: false

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

      https-port: 443

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

      ca: self-signed

      ca: lets-encrypt

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

      le-server-prod: false

      le-server-prod: true



    # authentication & authorization config

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

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

        # OAuth redirect URI

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

        redirect-uri: https://mec-platform.etsi.org/auth/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://gitlab.com/oauth/token

        # OAuth redirect URI

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

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

        # GitLab api url

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

        # OAuth k8s secret (data: client-id, secret)
@@ -205,7 +205,6 @@ repo: 
  #  Core Subsystem

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

  core:



    # Go Applications

    go-apps:

      meep-auth-svc:
@@ -305,6 +304,7 @@ repo: 
          - meep-sandbox-ctrl

          - meep-tc-engine

          - meep-app-enablement

          - meep-vis

        # location of API specifications

        api:

          - name: 'AdvantEDGE Monitoring Engine REST API'
@@ -383,6 +383,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
@@ -395,6 +396,7 @@ repo: 
          - meep-sandbox-ctrl

          - meep-tc-engine

          - meep-app-enablement

          - meep-vis

      meep-webhook:

        # location of source code

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

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

  sandbox:



    # Go Applications

    go-apps:

      meep-ams:
@@ -771,6 +772,38 @@ 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 Service REST API'

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

        # location of user supplied API specifications

        user-api:

        # resources available to docker container image

        docker-data:

          # location of entry script

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



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

  #  Dependencies
@@ -935,7 +968,6 @@ repo: 
  #  Packages

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

  packages:



    # Go Packages

    go-packages:

      meep-ams-client:
@@ -1113,6 +1145,11 @@ repo: 
        src: go-packages/meep-websocket

        # supports linting

        lint: true

      meep-vis-client:

        # location of source code

        src: go-packages/meep-vis-client

        # supports linting

        lint: false



    # Javascript Packages

    js-packages:
@@ -1156,4 +1193,3 @@ repo: 
        src: js-packages/meep-service-mgmt-client

        # supports linting

        lint: false

.vscode/settings.json

+22 −2
Original line number Diff line number Diff line 
{

    "go.formatTool": "goimports"

    "files.eol": "\n",

    "go.formatTool": "goimports",

    "go.lintTool": "golangci-lint",

    "go.lintFlags": [

        "--fast"

    ],

    // "go.useLanguageServer": false,

    "go.testOnSave": true,

    "[go]": {

        "editor.snippetSuggestions": "none",

        "editor.formatOnSave": true,

        "editor.codeActionsOnSave": {

            "source.organizeImports": true

        },

    },

    "[javascript]": {

        "editor.codeActionsOnSave": {

            "source.fixAll.eslint": true,

        },

    },

    "eslint.format.enable": true

}

charts/meep-vis/.helmignore

0 → 100644
+21 −0
Original line number Diff line number Diff line 
# Patterns to ignore when building packages.

# This supports shell glob matching, relative path matching, and

# negation (prefixed with !). Only one pattern per line.

.DS_Store

# Common VCS dirs

.git/

.gitignore

.bzr/

.bzrignore

.hg/

.hgignore

.svn/

# Common backup files

*.swp

*.bak

*.tmp

*~

# Various IDEs

.project

.idea/

*.tmproj

charts/meep-vis/Chart.yaml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
apiVersion: v1

appVersion: '1.0.0'

description: MEEP V2X Information Service Helm chart for Kubernetes

name: meep-vis

version: 1.0.0

charts/meep-vis/templates/_helpers.tpl

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{{/* vim: set filetype=mustache: */}}

{{/*

Expand the name of the chart.

*/}}

{{- define "meep-vis.name" -}}

{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}

{{- end -}}



{{/*

Create a default fully qualified app name.

We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

If release name contains chart name it will be used as a full name.

*/}}

{{- define "meep-vis.fullname" -}}

{{- if .Values.fullnameOverride -}}

{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}

{{- else -}}

{{- $name := default .Chart.Name .Values.nameOverride -}}

{{- if contains $name .Release.Name -}}

{{- .Release.Name | trunc 63 | trimSuffix "-" -}}

{{- else -}}

{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}

{{- end -}}

{{- end -}}

{{- end -}}



{{/*

Create chart name and version as used by the chart label.

*/}}

{{- define "meep-vis.chart" -}}

{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}

{{- end -}}