summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
4a1af0e)
Issue-ID: NONRTRIC-812
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
Change-Id: Ie425e0414bb3920233e769414d35c63d04f1f86a
settings *cli.EnvSettings
}
settings *cli.EnvSettings
}
-func NewHelmManager() *helmManagerImpl {
+func NewHelmManager(s *cli.EnvSettings) *helmManagerImpl {
//Ensure the file directory exists as it is required for file locking
err := os.MkdirAll(filepath.Dir(repoFile), os.ModePerm)
//Ensure the file directory exists as it is required for file locking
err := os.MkdirAll(filepath.Dir(repoFile), os.ModePerm)
- if err != nil && !os.IsExist(err) {
+ if err != nil && !errors.Is(err, fs.ErrNotExist) {
- b, err := ioutil.ReadFile(repoFile)
- if err != nil && !os.IsNotExist(err) {
+ b, err := os.ReadFile(repoFile)
+ if err != nil {
- fmt.Printf("repository name (%s) already exists\n", repoName)
+ log.Debugf("repository name (%s) already exists\n", repoName)
if err := f.WriteFile(repoFile, 0644); err != nil {
return err
}
if err := f.WriteFile(repoFile, 0644); err != nil {
return err
}
- fmt.Printf("%q has been added to your repositories\n", repoName)
+ log.Debugf("%q has been added to your repositories\n", repoName)
func (hm *helmManagerImpl) UninstallHelmChart(namespace, chartName string) {
actionConfig, err := getActionConfig(namespace)
if err != nil {
func (hm *helmManagerImpl) UninstallHelmChart(namespace, chartName string) {
actionConfig, err := getActionConfig(namespace)
if err != nil {
+ log.Error("unable to get action config: ", err)
+ return
}
iCli := action.NewUninstall(actionConfig)
resp, err := iCli.Run(chartName)
if err != nil {
}
iCli := action.NewUninstall(actionConfig)
resp, err := iCli.Run(chartName)
if err != nil {
+ log.Error("Unable to uninstall chart ", chartName, err)
+ return
}
log.Debug("Successfully uninstalled chart: ", resp.Release.Name)
}
}
log.Debug("Successfully uninstalled chart: ", resp.Release.Name)
}
if envvar := os.Getenv("KUBECONFIG"); len(envvar) > 0 {
kubeconfigPath = envvar
}
if envvar := os.Getenv("KUBECONFIG"); len(envvar) > 0 {
kubeconfigPath = envvar
}
- if err := actionConfig.Init(kube.GetConfig(kubeconfigPath, "", namespace), namespace, os.Getenv("HELM_DRIVER"),
- func(format string, v ...interface{}) {
- fmt.Sprintf(format, v)
- }); err != nil {
- fmt.Println(err)
+ if err := actionConfig.Init(kube.GetConfig(kubeconfigPath, "", namespace), namespace, os.Getenv("HELM_DRIVER"), log.Debugf); err != nil {
+ log.Error(err)
}
} else {
// Create the ConfigFlags struct instance with initialized values from ServiceAccount
}
} else {
// Create the ConfigFlags struct instance with initialized values from ServiceAccount
kubeConfig.BearerToken = &config.BearerToken
kubeConfig.CAFile = &config.CAFile
kubeConfig.Namespace = &namespace
kubeConfig.BearerToken = &config.BearerToken
kubeConfig.CAFile = &config.CAFile
kubeConfig.Namespace = &namespace
- if err := actionConfig.Init(kubeConfig, namespace, os.Getenv("HELM_DRIVER"), func(format string, v ...interface{}) {
- fmt.Sprintf(format, v)
- }); err != nil {
- fmt.Println(err)
+ if err := actionConfig.Init(kubeConfig, namespace, os.Getenv("HELM_DRIVER"), log.Debugf); err != nil {
+ log.Error(err)
}
}
return actionConfig, err
}
}
return actionConfig, err
"net/http"
"github.com/labstack/echo/v4"
"net/http"
"github.com/labstack/echo/v4"
+ "helm.sh/helm/v3/pkg/cli"
"oransc.org/nonrtric/capifcore/internal/discoverserviceapi"
"oransc.org/nonrtric/capifcore/internal/invokermanagementapi"
"oransc.org/nonrtric/capifcore/internal/providermanagementapi"
"oransc.org/nonrtric/capifcore/internal/discoverserviceapi"
"oransc.org/nonrtric/capifcore/internal/invokermanagementapi"
"oransc.org/nonrtric/capifcore/internal/providermanagementapi"
// Add repo
fmt.Printf("Adding %s to Helm Repo\n", url)
// Add repo
fmt.Printf("Adding %s to Helm Repo\n", url)
- helmManager = helmmanagement.NewHelmManager()
+ helmManager = helmmanagement.NewHelmManager(cli.New())
err := helmManager.AddToRepo(repoName, url)
if err != nil {
log.Fatal(err.Error())
err := helmManager.AddToRepo(repoName, url)
if err != nil {
log.Fatal(err.Error())