Commit 728510e4 authored by Nikhil Doifode's avatar Nikhil Doifode
Browse files

Removed sandbox name from release name

parent 5a72a15d

go-apps/meep-mon-engine/server/mon-engine.go

+2 −2
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ func addExpectedPods(sandboxName string) { 
		// Get sandbox-specific pod name

		var podName string

		prefix := "meep-"

		sandboxPrefix := prefix + sandboxName + "-"

		sandboxPrefix := prefix

		if strings.HasPrefix(pod, prefix) {

			podName = sandboxPrefix + pod[len(prefix):]

		} else {
@@ -632,7 +632,7 @@ func removeExpectedPods(sandboxName string) { 
		// Get sandbox-specific pod name

		var podName string

		prefix := "meep-"

		sandboxPrefix := prefix + sandboxName + "-"

		sandboxPrefix := prefix

		if strings.HasPrefix(pod, prefix) {

			podName = sandboxPrefix + pod[len(prefix):]

		} else {

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

+8 −8
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package helm



func GetReleasesName() ([]Release, error) {

	return getReleasesName()

func GetReleasesName(sandboxName string) ([]Release, error) {

	return getReleasesName(sandboxName)

}



/*
@@ -25,14 +25,14 @@ func GetReleasesName() ([]Release, error) { 
* https://github.com/helm/helm/issues/5952

 */



func GetReleases() ([]Release, error) {

	return getReleases()

func GetReleases(sandboxName string) ([]Release, error) {

	return getReleases(sandboxName)

}



func InstallCharts(charts []Chart) error {

	return runTask(Install, charts)

func InstallCharts(charts []Chart, sandboxName string) error {

	return runTask(Install, charts, sandboxName)

}



func DeleteReleases(charts []Chart) error {

	return runTask(Delete, charts)

func DeleteReleases(charts []Chart, sandboxName string) error {

	return runTask(Delete, charts, sandboxName)

}

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

+7 −7
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import ( 
	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

)



func installCharts(charts []Chart) error {

	err := ensureReleases(charts)

func installCharts(charts []Chart, sandboxName string) error {

	err := ensureReleases(charts, sandboxName)

	if err != nil {

		return err

	}
@@ -34,7 +34,7 @@ func installCharts(charts []Chart) error { 
		err := install(chart)

		if err != nil {

			log.Info("Cleaning installed releases")

			cleanReleases(charts)

			cleanReleases(charts, sandboxName)

			return err

		}

	}
@@ -42,9 +42,9 @@ func installCharts(charts []Chart) error { 
	return nil

}



func ensureReleases(charts []Chart) error {

func ensureReleases(charts []Chart, sandboxName string) error {

	// ensure that releases do not already exist

	releases, _ := GetReleasesName()

	releases, _ := GetReleasesName(sandboxName)

	for _, c := range charts {

		for _, r := range releases {

			if c.ReleaseName == r.Name {
@@ -83,10 +83,10 @@ func install(chart Chart) error { 
	return nil

}



func cleanReleases(charts []Chart) {

func cleanReleases(charts []Chart, sandboxName string) {

	var toClean []Chart

	var cnt int

	releases, _ := GetReleasesName()

	releases, _ := GetReleasesName(sandboxName)



	for _, c := range charts {

		for _, r := range releases {

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

+6 −6
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import ( 
	log "github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-logger"

)



func getReleasesName() ([]Release, error) {

	out, err := getList()

func getReleasesName(sandboxName string) ([]Release, error) {

	out, err := getList(sandboxName)

	if err != nil {

		return nil, err

	}
@@ -38,8 +38,8 @@ func getReleasesName() ([]Release, error) { 
	return release, nil

}



func getReleases() ([]Release, error) {

	out, err := getList()

func getReleases(sandboxName string) ([]Release, error) {

	out, err := getList(sandboxName)

	if err != nil {

		return nil, err

	}
@@ -51,8 +51,8 @@ func getReleases() ([]Release, error) { 
	return release, nil

}



func getList() ([]byte, error) {

	var cmd = exec.Command("helm", "ls", "-A")

func getList(sandboxName string) ([]byte, error) {

	var cmd = exec.Command("helm", "ls", "-n", sandboxName)

	out, err := cmd.Output()

	if err != nil {

		err = errors.New("Unable to list Releases")

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

+6 −5
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ const ( 
type Job struct {

	task        Task

	charts      []Chart

	sandboxName string

}



var queue *chan Job = nil
@@ -46,7 +47,7 @@ func startWorker() { 
			switch job.task {

			case Install:

				log.Debug("Installing ", len(job.charts), " Charts...")

				_ = installCharts(job.charts)

				_ = installCharts(job.charts, job.sandboxName)

				log.Debug("Charts installed (", len(job.charts), ")")



			case Delete:
@@ -59,9 +60,9 @@ func startWorker() { 
	}()

}



func runTask(task Task, charts []Chart) error {

func runTask(task Task, charts []Chart, sandboxName string) error {

	startWorker()

	var job Job = Job{task: task, charts: charts}

	var job Job = Job{task: task, charts: charts, sandboxName: sandboxName}

	*queue <- job

	return nil

}