Commit 3ecbe221 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

AdvantEDGE v1.6.2 support: auth service + deployment configuration updates

parent 7546cfae

build.sh

+2 −0
Changes for build.sh: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -30,6 +30,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

+30 −3
Changes for config/.meepctl-repocfg.yaml: 30 added lines, 3 removed lines.
Original line number Diff line number Diff line 
version: 1.6.0

version: 1.6.2

repo:

  name: AdvantEDGE
@@ -33,6 +33,9 @@ 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
@@ -73,6 +76,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
@@ -165,8 +193,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 +297,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:

config/permissions.yaml

+350 −461

File changed.

Preview size limit exceeded, changes collapsed.

config/values/meep-grafana.yaml

deleted100755 → 0
+0 −2
Changes for config/values/meep-grafana.yaml: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line 
ingress:

  enabled: false
 
 No newline at end of file

deploy.sh

+0 −10
Changes for deploy.sh: 0 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ BASEDIR=$(dirname "$SCRIPT") 


FRONTENDDIR=~/.meep/user/frontend

SWAGGERDIR=~/.meep/user/sandbox-swagger

VALUESDIR=~/.meep/user/values



echo ""

echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
@@ -28,14 +27,5 @@ mkdir -p $SWAGGERDIR 
rm -r $SWAGGERDIR/* 2> /dev/null

cp -r js-apps/swagger-ui/* $SWAGGERDIR



echo ""

echo "+ Updating configuration user values"

echo "$VALUESDIR"

mkdir -p $VALUESDIR

rm -r $VALUESDIR-bak 2> /dev/null

mkdir -p $VALUESDIR-bak

cp -r  $VALUESDIR/* $VALUESDIR-bak

cp -r config/values/* $VALUESDIR



echo ""

echo ">>> MEC Sandbox deployment completed"