X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fdeploy%2Fdeployment_manager.go;h=8d55b9ee4da84b54bc180300d815147b58db44c7;hb=b0e549aa3da1398ee8fa0967926b361768e12542;hp=edc8f80e69ceef096f4e47a8de1b5ccbd6392501;hpb=f95c1d3a137db6a4dd4ff7d8c3a8f5a2a7a55c2f;p=ric-plt%2Fricdms.git 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 }