Commit 6f807b8d authored by Simon Pastor's avatar Simon Pastor
Browse files

PR comment addressed

parent 24eddde6
Loading
Loading
Loading
Loading
+36 −73
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-auth-svc/api/swagger.yaml
        api: 
          meep-auth-svc: go-apps/meep-auth-svc/api/swagger.yaml
        # AdvantEDGE resources included in Docker container image
        docker-data:
          # location of REST API permissions file
@@ -182,7 +183,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-mon-engine/api/swagger.yaml
        api: 
          meep-mon-engine: go-apps/meep-mon-engine/api/swagger.yaml
        # list of dependencies pods to monitor
        dependency-pods:
          # - meep-cert-manager
@@ -212,7 +214,7 @@ repo:
          - meep-wais
          - meep-sandbox-ctrl
          - meep-tc-engine
          - meep-edge-platform-app-enablement
          - meep-app-enablement
      meep-platform-ctrl:
        # location of source code
        src: go-apps/meep-platform-ctrl
@@ -233,7 +235,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-platform-ctrl/api/swagger.yaml
        api:
          meep-platform-ctrl: go-apps/meep-platform-ctrl/api/swagger.yaml
        # AdvantEDGE resources included in Docker container image
        docker-data:
          # location of AdvantEDGE swagger files
@@ -272,7 +275,7 @@ repo:
          meep-wais: charts/meep-wais
          meep-sandbox-ctrl: charts/meep-sandbox-ctrl
          meep-tc-engine: charts/meep-tc-engine
          meep-edge-platform-app-enablement: charts/meep-edge-platform-app-enablement
          meep-app-enablement: charts/meep-app-enablement
          meep-virt-chart-templates: charts/meep-virt-chart-templates
        # list of sandbox specific pods
        sandbox-pods:
@@ -284,7 +287,7 @@ repo:
          - meep-wais
          - meep-sandbox-ctrl
          - meep-tc-engine
          - meep-edge-platform-app-enablement
          - meep-app-enablement
      meep-webhook:
        # location of source code
        src: go-apps/meep-webhook
@@ -370,9 +373,7 @@ repo:
          - sandbox.go-apps.meep-loc-serv
          - sandbox.go-apps.meep-rnis
          - sandbox.go-apps.meep-wais
          # app-support and service-mgmt are under one executable: meep-edge-platform-app-enablement
          - sandbox.go-apps.meep-app-support
          - sandbox.go-apps.meep-service-mgmt
          - sandbox.go-apps.meep-app-enablement
          - sandbox.go-apps.meep-metrics-engine
          - packages.go-packages.meep-metrics-engine-notification-client
          - sandbox.go-apps.meep-mg-manager
@@ -405,7 +406,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-gis-engine/api/swagger.yaml
        api:
          meep-gis-engine: go-apps/meep-gis-engine/api/swagger.yaml
      meep-loc-serv:
        # location of source code
        src: go-apps/meep-loc-serv
@@ -429,7 +431,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-loc-serv/api/swagger.yaml
        api:
          meep-loc-serv: go-apps/meep-loc-serv/api/swagger.yaml
      meep-metrics-engine:
        # location of source code
        src: go-apps/meep-metrics-engine
@@ -453,7 +456,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-metrics-engine/api/v2/swagger.yaml
        api:
          meep-metrics-engine: go-apps/meep-metrics-engine/api/v2/swagger.yaml
      meep-mg-manager:
        # location of source code
        src: go-apps/meep-mg-manager
@@ -474,7 +478,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-mg-manager/api/swagger.yaml
        api:
          meep-mg-manager: go-apps/meep-mg-manager/api/swagger.yaml
      meep-rnis:
        # location of source code
        src: go-apps/meep-rnis
@@ -498,7 +503,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-rnis/api/swagger.yaml
        api:
          meep-rnis: go-apps/meep-rnis/api/swagger.yaml
      meep-wais:
        # location of source code
        src: go-apps/meep-wais
@@ -522,7 +528,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-wais/api/swagger.yaml
        api:
          meep-wais: go-apps/meep-wais/api/swagger.yaml
      meep-sandbox-ctrl:
        # location of source code
        src: go-apps/meep-sandbox-ctrl
@@ -543,7 +550,8 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-sandbox-ctrl/api/swagger.yaml
        api:
          meep-sandbox-ctrl: go-apps/meep-sandbox-ctrl/api/swagger.yaml
        docker-data:
          'entrypoint.sh': go-apps/meep-sandbox-ctrl/entrypoint.sh
          swagger: bin/meep-sandbox-swagger-ui
@@ -581,15 +589,15 @@ repo:
        codecov: false
        # supports linting
        lint: true
      meep-edge-platform-app-enablement:
      meep-app-enablement:
        # location of source code
        src: go-apps/meep-edge-platform-app-enablement
        src: go-apps/meep-app-enablement
        # location of binary
        bin: bin/meep-edge-platform-app-enablement
        bin: bin/meep-app-enablement
        # location of deployment chart
        chart: charts/meep-edge-platform-app-enablement
        chart: charts/meep-app-enablement
        # user supplied value file located @ .meep/user/values (use below file name)
        chart-user-values: meep-edge-platform-app-enablement.yaml
        chart-user-values: meep-app-enablement.yaml
        # extra build flags
        build-flags:
          - -mod=vendor
@@ -604,56 +612,9 @@ repo:
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-edge-platform-app-enablement/api/app-support/swagger.yaml
      meep-app-support:
        ## location of source code
        src: go-apps/meep-edge-platform-app-enablement/server/app-support
        ## location of binary
        #bin: bin/meep-edge-platform-app-enablement
        ## location of deployment chart
        #chart: charts/meep-edge-platform-app-enablement
        ## user supplied value file located @ .meep/user/values (use below file name)
        #chart-user-values: meep-edge-platform-app-enablement.yaml
        # extra build flags
        #build-flags:
        #  - -mod=vendor
        # enable meepctl build
        build: false
        # enable meepctl dockerize
        dockerize: false
        # enable meepctl deploy/delete
        deploy: false
        # supports code coverage measurement when built in codecov mode
        codecov: false
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-edge-platform-app-enablement/api/app-support/swagger.yaml
      meep-service-mgmt:
        # location of source code
        src: go-apps/meep-edge-platform-app-enablement/server/service-mgmt
        ## location of binary
        #bin: bin/meep-edge-platform-app-enablement
        ## location of deployment chart
        #chart: charts/meep-edge-platform-app-enablement
        ## user supplied value file located @ .meep/user/values (use below file name)
        #chart-user-values: meep-edge-platform-app-enablement.yaml
        # extra build flags
        #build-flags:
        #  - -mod=vendor
        # enable meepctl build
        build: false
        # enable meepctl dockerize
        dockerize: false
        # enable meepctl deploy/delete
        deploy: false
        # supports code coverage measurement when built in codecov mode
        codecov: false
        # supports linting
        lint: true
        # location of API specification
        api: go-apps/meep-edge-platform-app-enablement/api/service-mgmt/swagger.yaml

        api:
          meep-app-support: go-apps/meep-app-enablement/api/app-support/swagger.yaml
          meep-service-mgmt: go-apps/meep-app-enablement/api/service-mgmt/swagger.yaml

  #------------------------------
  #  Dependencies
@@ -839,14 +800,16 @@ repo:
        # supports linting
        lint: false
        # location of API specification
        api: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml
        api: 
          meep-metrics-engine-notification-client: go-packages/meep-metrics-engine-notification-client/api/swagger.yaml
      meep-mg-app-client:
        # location of source code
        src: go-packages/meep-mg-app-client
        # supports linting
        lint: false
        # location of API specification
        api: go-packages/meep-mg-app-client/api/swagger.yaml
        api: 
          meep-mg-app-client: go-packages/meep-mg-app-client/api/swagger.yaml
      meep-mg-manager-client:
        # location of source code
        src: go-packages/meep-mg-manager-client
+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "meep-edge-platform-app-enablement.name" -}}
{{- define "meep-app-enablement.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}

@@ -11,7 +11,7 @@ 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-edge-platform-app-enablement.fullname" -}}
{{- define "meep-app-enablement.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name.
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "meep-edge-platform-app-enablement.chart" -}}
{{- define "meep-app-enablement.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
Loading