From: subhash kumar singh <subh.singh@samsung.com>
Date: Thu, 17 Nov 2022 08:51:11 +0000 (+0000)
Subject: Include version for release
X-Git-Tag: 2.0.0~6
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b0e549aa3da1398ee8fa0967926b361768e12542;p=ric-plt%2Fricdms.git

Include version for release

Included version in the release name.

Signed-off-by: subhash kumar singh <subh.singh@samsung.com>
Change-Id: Iade7094fad12fdf32033e30d385a50526c71d35b
---

diff --git a/pkg/deploy/deployment_manager.go b/pkg/deploy/deployment_manager.go
index edc8f80..8d55b9e 100644
--- a/pkg/deploy/deployment_manager.go
+++ b/pkg/deploy/deployment_manager.go
@@ -38,14 +38,14 @@ type DeploymentManager struct {
 const (
 	HELM_DRIVER        = "HELM_DRIVER"
 	CHART_NAME_FORMAT  = "chart-%s-%s.tgz"
-	RELESE_NAME_FORMAT = "ricdms-%s-rel"
+	RELESE_NAME_FORMAT = "ricdms-%s-rel-%s"
 )
 
 func NewDeploymentManager() IDeploy {
 	return &DeploymentManager{}
 }
 
-func (d *DeploymentManager) install(chartPath, appName, namesapce string) error {
+func (d *DeploymentManager) install(chartPath, appName, version, namesapce string) error {
 	conf := action.Configuration{}
 	err := conf.Init(d.settings.RESTClientGetter(), "namespace", os.Getenv(HELM_DRIVER), ricdms.Logger.Debug)
 
@@ -55,7 +55,7 @@ func (d *DeploymentManager) install(chartPath, appName, namesapce string) error
 	}
 
 	install := action.NewInstall(&conf)
-	install.ReleaseName = fmt.Sprintf(RELESE_NAME_FORMAT, appName)
+	install.ReleaseName = fmt.Sprintf(RELESE_NAME_FORMAT, appName, version)
 	install.Namespace = namesapce
 
 	cp, err := install.ChartPathOptions.LocateChart(chartPath, d.settings)
@@ -105,7 +105,7 @@ func (d *DeploymentManager) Deploy(reader io.ReadCloser, appname, version, names
 		return err
 	}
 
-	err = d.install(fmt.Sprintf(CHART_NAME_FORMAT, appname, version), appname, namespace)
+	err = d.install(fmt.Sprintf(CHART_NAME_FORMAT, appname, version), appname, version, namespace)
 	if err != nil {
 		return err
 	}