Commit 75313740 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'develop'

parents 21b04d76 d7e2f5cd

build.sh

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ eslint src 


echo ""

echo "+ Installing client packages"

mkdir -p $BASEDIR/js-packages

install_package meep-auth-svc-client

install_package meep-gis-engine-client

install_package meep-metrics-engine-client

install_package meep-platform-ctrl-client

config/.meepctl-repocfg.yaml

+60 −4
Original line number Diff line number Diff line 
version: 1.6.0

version: 1.6.6

repo:

  name: AdvantEDGE
@@ -33,11 +33,14 @@ repo: 


    # authentication & authorization config

    auth:

      # enable authentication & authorization

      enabled: true

      # Session config

      session:

        # session encryption key k8s secret (data: encryption-key)

        key-secret: meep-session

        # maximum simultaneous sessions

        max-sessions: 10

        max-sessions: 9

      # GitHub OAuth provider config

      github:

        # enable GitHub OAuth
@@ -65,6 +68,23 @@ repo: 
        # OAuth k8s secret (data: client-id, secret)

        secret: meep-oauth-gitlab



    # Default monitoring dashboards

    dashboards:

      mec-sandbox: dashboards/mec-sandbox.json

      platform-advantedge: dashboards/platform-advantedge.json

      platform-k8s: dashboards/platform-k8s.json

      runtime-environment-node: dashboards/runtime-environment-node.json

      runtime-environment-k8s-cluster: dashboards/runtime-environment-k8s-cluster.json

      kubelet: dashboards/kubelet.json

      prometheus: dashboards/prometheus.json



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

  #  Resource Prerequisites

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

  resource-prerequisites:

    # k8s Custom Resource Definitions

    crds:

      servicemonitors.monitoring.coreos.com: charts/kube-prometheus-stack/crds/crd-servicemonitors.yaml



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

  #  Core Subsystem
@@ -73,6 +93,31 @@ repo: 


    # Go Applications

    go-apps:

      meep-auth-svc:

        # location of source code

        src: go-apps/meep-auth-svc

        # location of binary

        bin: bin/meep-auth-svc

        # location of deployment chart

        chart: charts/meep-auth-svc

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

        chart-user-values: meep-auth-svc.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 specification

        api: go-apps/meep-auth-svc/api/swagger.yaml

        # AdvantEDGE resources included in Docker container image

        docker-data:

          # location of REST API permissions file

          'permissions.yaml': config/permissions.yaml

      meep-ingress-certs:

        # enable meepctl build

        build: false
@@ -122,6 +167,7 @@ repo: 
          - meep-open-map-tiles

          - meep-postgis

          - meep-redis

          - meep-prometheus

        # list of platform pods to monitor

        core-pods:

          - meep-mon-engine
@@ -165,8 +211,6 @@ repo: 
          swagger: bin/meep-platform-swagger-ui

          # location of AdvantEDGE frontend

          frontend: bin/meep-frontend

          # location of REST API permissions file

          'permissions.yaml': config/permissions.yaml

      meep-virt-engine:

        # location of source code

        src: go-apps/meep-virt-engine
@@ -271,6 +315,7 @@ repo: 
        lint: false

        # list of platform level swagger specs

        api-bundle:

          - core.go-apps.meep-auth-svc

          - core.go-apps.meep-platform-ctrl

          - core.go-apps.meep-mon-engine

      meep-sandbox-swagger-ui:
@@ -616,6 +661,17 @@ repo: 
      chart: charts/postgis

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

      chart-user-values: meep-postgis.yaml

    meep-prometheus:

      # enable meepctl build -> deps are never built

      build: false

      # enable meepctl dockerize -> deps are never dockerized

      dockerize: false

      # enable meepctl deploy/delete

      deploy: true

      # location of deployment chart

      chart: charts/kube-prometheus-stack

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

      chart-user-values: meep-prometheus.yaml



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

  #  Packages

config/dashboards/mec-sandbox.json

0 → 100644
+2706 −0

File added.

Preview size limit exceeded, changes collapsed.

config/permissions.yaml

+541 −652

File changed.

Preview size limit exceeded, changes collapsed.

config/values/meep-grafana.yaml

deleted100755 → 0
+0 −2
Original line number Diff line number Diff line 
ingress:

  enabled: false
 
 No newline at end of file