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

Merge branch 'Task2_PoC' into 'STF678_Task1_2'

add the anonymous functions to initialize the service and metrics endpoints as...

See merge request mec/AdvantEDGE!19
parents e6e86074 def4c87f
Loading
Loading
Loading
Loading
+83 −42
Original line number Diff line number Diff line
@@ -290,6 +290,7 @@ repo:
        core-pods:
          - meep-mon-engine
          - meep-platform-ctrl
          - meep-sandbox-api
          - meep-virt-engine
          - meep-webhook
        # list of sandbox pods to monitor
@@ -299,7 +300,7 @@ repo:
          - meep-metrics-engine
          - meep-mg-manager
          - meep-rnis
          - meep-dai
#          - meep-dai
          - meep-tm
          - meep-wais
          - meep-ams
@@ -350,6 +351,39 @@ repo:
          swagger: js-apps/meep-swagger-ui
          # location of AdvantEDGE frontend
          frontend: bin/meep-frontend
      meep-sandbox-api:
        # location of source code
        src: go-apps/meep-sandbox-api
        # location of binary
        bin: bin/meep-sandbox-api
        # location of deployment chart
        chart: charts/meep-sandbox-api
        # user supplied value file located @ .meep/user/values (use below file name)
        chart-user-values: meep-sandbox-api.yaml
        # 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 HTTP REST API'
            file: go-apps/meep-sandbox-api/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-sandbox-api/entrypoint.sh
          # location of Swagger UI
          swagger: js-apps/meep-swagger-ui
          # location of AdvantEDGE frontend
          frontend: bin/meep-frontend
      meep-virt-engine:
        # location of source code
        src: go-apps/meep-virt-engine
@@ -379,7 +413,7 @@ repo:
          meep-metrics-engine: charts/meep-metrics-engine
          meep-mg-manager: charts/meep-mg-manager
          meep-rnis: charts/meep-rnis
          meep-dai: charts/meep-dai
#          meep-dai: charts/meep-dai
          meep-tm: charts/meep-tm
          meep-wais: charts/meep-wais
          meep-ams: charts/meep-ams
@@ -395,7 +429,7 @@ repo:
          - meep-metrics-engine
          - meep-mg-manager
          - meep-rnis
          - meep-dai
#          - meep-dai
          - meep-tm
          - meep-wais
          - meep-ams
@@ -678,6 +712,8 @@ repo:
            file: go-apps/meep-rnis/api/swagger.yaml
        # location of user supplied API specifications
        user-api:
          - name: 'Radio Network Information Service REST API'
            file: config/api/rnis-api.yaml
        # resources available to docker container image
        docker-data:
          # location of entry script
@@ -845,40 +881,40 @@ repo:
        docker-data:
          # location of entry script
          'entrypoint.sh': go-apps/meep-vis/entrypoint.sh
      meep-dai:
        # location of source code
        src: go-apps/meep-dai
        # location of binary
        bin: bin/meep-dai
        # location of deployment chart
        chart: charts/meep-dai
        # user supplied value file located @ .meep/user/values (use below file name)
        chart-user-values: meep-dai.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 onboarded device application instantiation
        onboardedapp: true
        # supports linting
        lint: true
        # location of API specifications
        api:
          - name: 'AdvantEDGE Device Application Interface Service REST API'
            file: go-apps/meep-dai/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-dai/entrypoint.sh
#      meep-dai:
#        # location of source code
#        src: go-apps/meep-dai
#        # location of binary
#        bin: bin/meep-dai
#        # location of deployment chart
#        chart: charts/meep-dai
#        # user supplied value file located @ .meep/user/values (use below file name)
#       chart-user-values: meep-dai.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 onboarded device application instantiation
#        onboardedapp: true
#        # supports linting
#        lint: true
#        # location of API specifications
#        api:
#          - name: 'AdvantEDGE Device Application Interface Service REST API'
#            file: go-apps/meep-dai/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-dai/entrypoint.sh

  #------------------------------
  #  Dependencies
@@ -1229,11 +1265,11 @@ repo:
        src: go-packages/meep-websocket
        # supports linting
        lint: true
      meep-dai-client:
        # location of source code
        src: go-packages/meep-dai-client
        # supports linting
        lint: false
#      meep-dai-client:
#        # location of source code
#        src: go-packages/meep-dai-client
#       # supports linting
#       lint: false

    # Javascript Packages
    js-packages:
@@ -1262,6 +1298,11 @@ repo:
        src: js-packages/meep-platform-ctrl-client
        # supports linting
        lint: false
      meep-sandbox-api-client:
        # location of source code
        src: go-packages/meep-sandbox-api-client
        # supports linting
        lint: false
      meep-sandbox-ctrl-client:
        # location of source code
        src: js-packages/meep-sandbox-ctrl-client

.vscode/settings.json

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line
{
    "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
}
+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
+5 −0
Original line number Diff line number Diff line
apiVersion: v2
appVersion: "1.0.0"
description: Meep Sandbox API Helm chart for Kubernetes
name: meep-sandbox-api
version: 1.0.0
+32 −0
Original line number Diff line number Diff line
{{/* vim: set filetype=mustache: */}}
{{/*
Expand the name of the chart.
*/}}
{{- define "meep-sandbox-api.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-sandbox-api.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-sandbox-api.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
Loading