Merge pull request #89 from dilallkx/kd_sp44_dev_virt (d58a3ffc) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

.meepctl-repocfg.yaml

+29 −20

Original line number	Diff line number	Diff line
		@@ -31,15 +31,35 @@ repo:
		- -mod=vendor
		codecov: true
		lint: true
		monitor: true
		api: go-apps/meep-mon-engine/api/swagger.yaml
		dependency-pods:
		- meep-couchdb
		- meep-docker-registry
		- meep-grafana
		- meep-ingress
		- meep-influxdb
		- meep-kube-state-metrics
		- meep-open-map-tiles
		- meep-postgis
		- meep-redis
		core-pods:
		- meep-mon-engine
		- meep-platform-ctrl
		- meep-virt-engine
		- meep-webhook
		sandbox-pods:
		- meep-loc-serv
		- meep-metrics-engine
		- meep-mg-manager
		- meep-rnis
		- meep-sandbox-ctrl
		- meep-tc-engine
		meep-platform-ctrl:
		src: go-apps/meep-platform-ctrl
		bin: bin/meep-platform-ctrl
		chart: charts/meep-platform-ctrl
		codecov: true
		lint: true
		monitor: true
		api: go-apps/meep-platform-ctrl/api/swagger.yaml
		docker-data:
		swagger: bin/meep-platform-swagger-ui
		@@ -50,7 +70,6 @@ repo:
		chart: charts/meep-virt-engine
		codecov: true
		lint: true
		monitor: true
		docker-data:
		'entrypoint.sh': go-apps/meep-virt-engine/entrypoint.sh
		meep-loc-serv: charts/meep-loc-serv
		@@ -60,6 +79,13 @@ repo:
		meep-sandbox-ctrl: charts/meep-sandbox-ctrl
		meep-tc-engine: charts/meep-tc-engine
		meep-virt-chart-templates: charts/meep-virt-chart-templates
		sandbox-pods:
		- meep-loc-serv
		- meep-metrics-engine
		- meep-mg-manager
		- meep-rnis
		- meep-sandbox-ctrl
		- meep-tc-engine
		meep-webhook:
		src: go-apps/meep-webhook
		bin: bin/meep-webhook
		@@ -68,7 +94,6 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true

		# Javascript Applications
		js-apps:
		@@ -117,7 +142,6 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-loc-serv/api/swagger.yaml
		meep-metrics-engine:
		src: go-apps/meep-metrics-engine
		@@ -127,7 +151,6 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-metrics-engine/api/v2/swagger.yaml
		meep-mg-manager:
		src: go-apps/meep-mg-manager
		@@ -135,7 +158,6 @@ repo:
		chart: charts/meep-mg-manager
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-mg-manager/api/swagger.yaml
		meep-rnis:
		src: go-apps/meep-rnis
		@@ -145,7 +167,6 @@ repo:
		- -mod=vendor
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-rnis/api/swagger.yaml
		meep-sandbox-ctrl:
		src: go-apps/meep-sandbox-ctrl
		@@ -153,7 +174,6 @@ repo:
		chart: charts/meep-sandbox-ctrl
		codecov: false
		lint: true
		monitor: true
		api: go-apps/meep-sandbox-ctrl/api/swagger.yaml
		docker-data:
		'entrypoint.sh': go-apps/meep-sandbox-ctrl/entrypoint.sh
		@@ -164,13 +184,11 @@ repo:
		chart: charts/meep-tc-engine
		codecov: false
		lint: true
		monitor: true
		meep-tc-sidecar:
		src: go-apps/meep-tc-sidecar
		bin: bin/meep-tc-sidecar
		codecov: false
		lint: true
		monitor: false

		#------------------------------
		# Dependencies
		@@ -178,31 +196,22 @@ repo:
		dep:
		meep-couchdb:
		chart: charts/couchdb
		monitor: true
		meep-docker-registry:
		chart: charts/docker-registry
		monitor: true
		meep-grafana:
		chart: charts/grafana
		monitor: true
		meep-influxdb:
		chart: charts/influxdb
		monitor: true
		meep-kube-state-metrics:
		chart: charts/kube-state-metrics
		monitor: true
		meep-ingress:
		chart: charts/nginx-ingress
		monitor: true
		meep-redis:
		chart: charts/redis
		monitor: true
		meep-open-map-tiles:
		chart: charts/open-map-tiles
		monitor: true
		meep-postgis:
		chart: charts/postgis
		monitor: true

		#------------------------------
		# Packages

charts/meep-mon-engine/values.yaml

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ image:
		tag: latest
		pullPolicy: Always
		env:
		# Provide comma-spearated list of expected pods to be monitored
		# Provide comma-separated list of expected pods to be monitored
		MEEP_DEPENDENCY_PODS: ""
		MEEP_CORE_PODS: ""
		MEEP_SANDBOX_PODS: ""

charts/meep-virt-engine/values.yaml

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ image:
		tag: latest
		pullPolicy: Always
		env:
		# Provide comma-separated list of pods to create in sandbox
		MEEP_SANDBOX_PODS: ""
		MEEP_HOST_URL: "http://www.example.com"

		service:

go-apps/meep-virt-engine/helm/delete.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,13 +24,14 @@ import (

		func deleteReleases(charts []Chart) error {
		for _, c := range charts {
		go deleteRelease(c)
		deleteRelease(c)
		}

		return nil
		}

		func deleteRelease(chart Chart) {
		log.Debug("Deleting release: " + chart.ReleaseName)
		var cmd = exec.Command("helm", "delete", chart.ReleaseName, "--purge")
		out, err := cmd.CombinedOutput()
		if err != nil {

go-apps/meep-virt-engine/helm/helm.go

+2 −38

Original line number	Diff line number	Diff line
		@@ -16,20 +16,6 @@

		package helm

		import (
		"fmt"

		log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"
		)

		const (
		StateIdle = "IDLE"
		StateInstalling = "INSTALLING"
		StateDeleting = "DELETING"
		)

		var state string = StateIdle

		func GetReleasesName() ([]Release, error) {
		return getReleasesName()
		}
		@@ -39,31 +25,9 @@ func GetReleases() ([]Release, error) {
		}

		func InstallCharts(charts []Chart) error {
		if state == StateIdle {
		state = StateInstalling
		go func() {
		log.Debug("Installing ", len(charts), " Charts...")
		_ = installCharts(charts)
		log.Debug("Charts installed (", len(charts), ")")
		state = StateIdle
		}()
		return nil
		}
		err := fmt.Errorf("Service busy [%s]", state)
		return err
		return runTask(Install, charts)
		}

		func DeleteReleases(charts []Chart) error {
		if state == StateIdle {
		state = StateDeleting
		go func() {
		log.Debug("Deleting ", len(charts), " Releases...")
		_ = deleteReleases(charts)
		log.Debug("Releases deleted (", len(charts), ")")
		state = StateIdle
		}()
		return nil
		}
		err := fmt.Errorf("Service busy [%s]", state)
		return err
		return runTask(Delete, charts)
		}