Commit c599bcaa authored by Yann Garcia's avatar Yann Garcia
Browse files

Merging issue on go-apps/meep-virt-engine/helm/install.go

parent 6c87cabe

charts/meep-dai/templates/deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ spec: 
          env:

            {{- range $key, $value := .Values.image.env }}

            - name: {{ $key }}

              value: {{ $value | quote }}

              value: {{ $value }}

            {{- end }}

          volumeMounts:

          - name: onboardedapp-storage

go-apps/meep-dai/main.go

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2022  ETSI STF 625

 * Copyright (c) 2022  The AdvantEDGE Authors

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */





package main



import (

go-apps/meep-dai/main_test.go

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2022  ETSI STF 625

 * Copyright (c) 2022  The AdvantEDGE Authors

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */





package main



import (

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

+4 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ func install(chart Chart) error { 
	if strings.Trim(chart.ValuesFile, " ") == "" {

		codecovLocation := strings.TrimSpace(os.Getenv("MEEP_CODECOV_LOCATION")) + chart.ReleaseName

		codecovEnabled := strings.TrimSpace(os.Getenv("MEEP_CODECOV"))

		onboardedappLocation := strings.TrimSpace(os.Getenv("MEEP_ONBOARDEDAPP_LOCATION")) + chart.ReleaseName

		cmd = exec.Command("helm", "install", chart.ReleaseName,

			"--namespace", chart.Namespace, "--create-namespace",

			"--set", "nameOverride="+chart.Name,
@@ -71,7 +72,9 @@ 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)

			"--set", "image.env.MEEP_CODECOV="+codecovEnabled,

			"--set", "onboardedapp.enabled="+strings.TrimSpace(os.Getenv("MEEP_ONBOARDEDAPP")),

			"--set", "onboardedapp.location="+onboardedappLocation)

	} else {

		cmd = exec.Command("helm", "install", chart.ReleaseName,

			"--namespace", chart.Namespace, "--create-namespace",

test/system/go.mod

+1 −0
Original line number Diff line number Diff line
@@ -27,4 +27,5 @@ replace ( 
	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-service-mgmt-client => ../../go-packages/meep-service-mgmt-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-vis-client => ../../go-packages/meep-vis-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-wais-client => ../../go-packages/meep-wais-client

	github.com/InterDigitalInc/AdvantEDGE/go-packages/meep-dai-client => ../../go-packages/meep-dai-client

)