X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=capifcore%2Finternal%2Fhelmmanagement%2Fhelm.go;h=bf245f0eab5f21615f102b50e32d3378bbb024a5;hb=8fa464fbe92fe7fa2107915accfe93cb932fb021;hp=99c27cc9a2f5390086db3207f49346ec50a5ff6d;hpb=f5f140a783fbe4afcecf409f5712dd3e0d4d6ea4;p=nonrtric%2Fplt%2Fsme.git

diff --git a/capifcore/internal/helmmanagement/helm.go b/capifcore/internal/helmmanagement/helm.go
index 99c27cc..bf245f0 100644
--- a/capifcore/internal/helmmanagement/helm.go
+++ b/capifcore/internal/helmmanagement/helm.go
@@ -22,11 +22,10 @@ package helmmanagement
 
 import (
 	"fmt"
-	"io/fs"
 	"os"
 	"path/filepath"
+	"strings"
 
-	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v2"
 	"helm.sh/helm/v3/pkg/action"
@@ -49,6 +48,7 @@ type HelmManager interface {
 type helmManagerImpl struct {
 	settings *cli.EnvSettings
 	repo     *repo.ChartRepository
+	setUp    bool
 }
 
 func NewHelmManager(s *cli.EnvSettings) *helmManagerImpl {
@@ -58,16 +58,21 @@ func NewHelmManager(s *cli.EnvSettings) *helmManagerImpl {
 }
 
 func (hm *helmManagerImpl) SetUpRepo(repoName, url string) error {
+	if len(strings.TrimSpace(url)) == 0 {
+		log.Info("No ChartMuseum repo set up.")
+		return nil
+	}
+	log.Debugf("Adding %s to Helm Repo\n", url)
 	repoFile := hm.settings.RepositoryConfig
 
 	//Ensure the file directory exists as it is required for file locking
 	err := os.MkdirAll(filepath.Dir(repoFile), os.ModePerm)
-	if err != nil && !errors.Is(err, fs.ErrNotExist) {
+	if err != nil && !os.IsExist(err) {
 		return err
 	}
 
 	b, err := os.ReadFile(repoFile)
-	if err != nil {
+	if err != nil && !os.IsNotExist(err) {
 		return err
 	}
 
@@ -78,6 +83,7 @@ func (hm *helmManagerImpl) SetUpRepo(repoName, url string) error {
 
 	if f.Has(repoName) {
 		log.Debugf("repository name (%s) already exists\n", repoName)
+		hm.setUp = true
 		return nil
 	}
 
@@ -94,21 +100,26 @@ func (hm *helmManagerImpl) SetUpRepo(repoName, url string) error {
 		}
 	}
 
-	if _, err := r.DownloadIndexFile(); err != nil {
-		err := errors.Wrapf(err, "looks like %q is not a valid chart repository or cannot be reached", url)
+	if _, err = r.DownloadIndexFile(); err != nil {
+		log.Errorf("looks like %q is not a valid chart repository or cannot be reached", url)
 		return err
 	}
 
 	f.Update(&c)
 
-	if err := f.WriteFile(repoFile, 0644); err != nil {
+	if err = f.WriteFile(repoFile, 0644); err != nil {
 		return err
 	}
 	log.Debugf("%q has been added to your repositories\n", repoName)
+	hm.setUp = true
 	return nil
 }
 
 func (hm *helmManagerImpl) InstallHelmChart(namespace, repoName, chartName, releaseName string) error {
+	if !hm.setUp {
+		log.Warnf("Helm repo not added, so chart %s not installed", chartName)
+		return nil
+	}
 	actionConfig, err := getActionConfig(namespace)
 	if err != nil {
 		return err
@@ -118,13 +129,13 @@ func (hm *helmManagerImpl) InstallHelmChart(namespace, repoName, chartName, rele
 
 	cp, err := install.ChartPathOptions.LocateChart(fmt.Sprintf("%s/%s", repoName, chartName), hm.settings)
 	if err != nil {
-		log.Error("Unable to locate chart!")
+		log.Errorf("Unable to locate chart: %s", chartName)
 		return err
 	}
 
 	chartRequested, err := loader.Load(cp)
 	if err != nil {
-		log.Error("Unable to load chart path!")
+		log.Errorf("Unable to load chart path for chart: %s", chartName)
 		return err
 	}
 
@@ -132,7 +143,7 @@ func (hm *helmManagerImpl) InstallHelmChart(namespace, repoName, chartName, rele
 	install.ReleaseName = releaseName
 	_, err = install.Run(chartRequested, nil)
 	if err != nil {
-		log.Error("Unable to run chart!")
+		log.Errorf("Unable to run chart: %s", chartName)
 		return err
 	}
 	log.Debug("Successfully onboarded ", namespace, repoName, chartName, releaseName)