fix(meep-virt-engine): remove wait & prioritze based deployments option (84e4b934) · Commits · MEC - Multi-access Edge Computing / ETSI MEC Sandbox

go-apps/meep-tilt/Tiltfile

+5 −5

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ for app in CORE_APPS:

		local_resource(
		app + ':code',
		cmd='echo "=== [' + app + '] Go code changed ===" && cd ' + REPO_ROOT + ' && meepctl build ' + app + ' --nolint && chown -R $SUDO_UID:$SUDO_GID go-apps/' + app + ' && meepctl dockerize ' + app + ' && meepctl deploy core ' + app + ' --force',
		cmd='echo "=== [' + app + '] Go code changed ===" && cd ' + REPO_ROOT + ' && meepctl build ' + app + ' --nolint && chown -R $SUDO_UID:$SUDO_GID go-apps/' + app + ' && meepctl dockerize ' + app + ' && chown -R $SUDO_UID:$SUDO_GID bin/' + app + ' && meepctl deploy core ' + app + ' --force',
		deps=[REPO_ROOT + '/go-apps/' + app + '/'],
		ignore=[
		REPO_ROOT + '/go-apps/' + app + '/vendor/',
		@@ -137,7 +137,7 @@ for app in CORE_APPS:
		for app in SANDBOX_APPS:
		local_resource(
		app + ':code',
		cmd='echo "=== [' + app + '] Go code changed ===" && cd ' + REPO_ROOT + ' && meepctl build ' + app + ' --nolint && chown -R $SUDO_UID:$SUDO_GID go-apps/' + app + ' && meepctl dockerize ' + app + ' && ' + restart_deploys_by_image_cmd(app),
		cmd='echo "=== [' + app + '] Go code changed ===" && cd ' + REPO_ROOT + ' && meepctl build ' + app + ' --nolint && chown -R $SUDO_UID:$SUDO_GID go-apps/' + app + ' && meepctl dockerize ' + app + ' && chown -R $SUDO_UID:$SUDO_GID bin/' + app + ' && ' + restart_deploys_by_image_cmd(app),
		deps=[REPO_ROOT + '/go-apps/' + app + '/'],
		ignore=[
		REPO_ROOT + '/go-apps/' + app + '/vendor/',
		@@ -160,7 +160,7 @@ for app in SANDBOX_APPS:
		# 1. meep-virt-engine own Go code changes
		local_resource(
		'meep-virt-engine:code',
		cmd='echo "=== [meep-virt-engine] Go code changed ===" && cd ' + REPO_ROOT + ' && meepctl build meep-virt-engine --nolint && chown -R $SUDO_UID:$SUDO_GID go-apps/meep-virt-engine && meepctl dockerize meep-virt-engine && meepctl deploy core meep-virt-engine --force',
		cmd='echo "=== [meep-virt-engine] Go code changed ===" && cd ' + REPO_ROOT + ' && meepctl build meep-virt-engine --nolint && chown -R $SUDO_UID:$SUDO_GID go-apps/meep-virt-engine && meepctl dockerize meep-virt-engine && chown -R $SUDO_UID:$SUDO_GID bin/meep-virt-engine && meepctl deploy core meep-virt-engine --force',
		deps=[REPO_ROOT + '/go-apps/meep-virt-engine/'],
		ignore=[
		REPO_ROOT + '/go-apps/meep-virt-engine/vendor/',
		@@ -185,7 +185,7 @@ local_resource(
		sandbox_chart_deps = [REPO_ROOT + '/charts/' + app + '/' for app in SANDBOX_APPS]
		local_resource(
		'meep-virt-engine:sandbox-charts',
		cmd='echo "=== [meep-virt-engine] Sandbox chart changed ===" && echo "Re-dockerizing meep-virt-engine to bundle updated charts..." && cd ' + REPO_ROOT + ' && meepctl dockerize meep-virt-engine && meepctl deploy core meep-virt-engine --force',
		cmd='echo "=== [meep-virt-engine] Sandbox chart changed ===" && echo "Re-dockerizing meep-virt-engine to bundle updated charts..." && cd ' + REPO_ROOT + ' && meepctl dockerize meep-virt-engine && chown -R $SUDO_UID:$SUDO_GID bin/meep-virt-engine && meepctl deploy core meep-virt-engine --force',
		deps=sandbox_chart_deps,
		auto_init=False,
		trigger_mode=TRIGGER_MODE_MANUAL,
		@@ -254,7 +254,7 @@ local_resource(

		local_resource(
		'util:dockerize-all',
		cmd='cd ' + REPO_ROOT + ' && meepctl dockerize all',
		cmd='cd ' + REPO_ROOT + ' && meepctl dockerize all && chown -R $SUDO_UID:$SUDO_GID bin/',
		auto_init=False,
		trigger_mode=TRIGGER_MODE_MANUAL,
		labels=['util'],

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -73,8 +73,7 @@ func install(chart Chart) error {
		chart.Location, "--replace", "--disable-openapi-validation",
		"--set", "codecov.enabled="+codecovEnabled,
		"--set", "codecov.location="+codecovLocation,
		"--set", "image.env.MEEP_CODECOV="+codecovEnabled,
		"--wait") /*,
		"--set", "image.env.MEEP_CODECOV="+codecovEnabled) /*,
		"--set", "onboardedapp.enabled="+onboardedappEnabled,
		"--set", "onboardedapp.location="+onboardedappLocation)*/
		} else {
		@@ -83,8 +82,7 @@ func install(chart Chart) error {
		"--set", "nameOverride="+chart.Name,
		"--set", "fullnameOverride="+chart.Name,
		"-f", chart.ValuesFile,
		chart.Location, "--replace",
		"--wait")
		chart.Location, "--replace")
		}
		out, err := cmd.CombinedOutput()
		if err != nil {

go-apps/meep-virt-engine/server/chart-template.go

+0 −50

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import (
		"errors"
		"os"
		"path/filepath"
		"sort"
		"strconv"
		"strings"
		"text/template"
		@@ -455,19 +454,6 @@ func generateScenarioCharts(sandboxName string, procName string, model *mod.Mode
		log.Debug("chart added ", len(charts))
		}
		}

		// Sort charts by priority score
		sort.Slice(charts, func(i, j int) bool {
		cI := charts[i]
		cJ := charts[j]
		scoreI := getChartPriorityScore(cI.Name)
		scoreJ := getChartPriorityScore(cJ.Name)
		if scoreI != scoreJ {
		return scoreI < scoreJ
		}
		return cI.Name < cJ.Name
		})

		return charts, nil
		}

		@@ -756,39 +742,3 @@ func getSanboxChartTemplates() (templates []string, err error) {
		templates, _ = file.Readdirnames(0)
		return templates, nil
		}

		func getChartPriorityScore(name string) int {
		if strings.Contains(name, "mosquitto") \|\| strings.Contains(name, "broker") {
		return 10
		}

		if strings.HasPrefix(name, "mep") {
		parts := strings.Split(name, "-")
		if len(parts) >= 2 {
		mepPart := parts[0]
		mepNum := 1
		if len(mepPart) > 3 {
		if num, err := strconv.Atoi(mepPart[3:]); err == nil {
		mepNum = num
		}
		}

		mecNum := -1
		for _, part := range parts {
		if strings.HasPrefix(part, "mec") && len(part) > 3 {
		if num, err := strconv.Atoi(part[3:]); err == nil {
		mecNum = num
		break
		}
		}
		}

		if mecNum != -1 {
		return mepNum*1000 + mecNum
		} else {
		return mepNum*1000 + 1
		}
		}
		}
		return 100000
		}