X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=mecm%2Fmepm%2Fapplcm%2Fk8shelm%2Fpkg%2Fplugin%2Fhelmclient.go;h=d756ef9c249a768c7f6fd1dd816ec5529c47d143;hb=5011a34d8324f1458ead3734992058c60d7af761;hp=0115ed99935c51ea043465522f9be8f213539654;hpb=68e4075a8ba4a80b7727824eb8a91216a18c32dc;p=ealt-edge.git

diff --git a/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go b/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go
index 0115ed9..d756ef9 100644
--- a/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go
+++ b/mecm/mepm/applcm/k8shelm/pkg/plugin/helmclient.go
@@ -19,25 +19,26 @@ package plugin
 import (
 	"bytes"
 	"fmt"
+	"os"
+
 	"github.com/sirupsen/logrus"
 	"helm.sh/helm/v3/pkg/action"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/kube"
-	"os"
 )
 
-// Constants to be taken from deployment file
-const (
-	releaseNamespace  = "default"
-	chartPath  = "/go/release/charts/"
-	kubeconfigPath  = "/go/release/kubeconfig/"
+// Variables to be defined in deployment file
+var (
+	chartPath        = os.Getenv("CHART_PATH")
+	kubeconfigPath   = os.Getenv("KUBECONFIG_DIR_PATH")
+	releaseNamespace = os.Getenv("RELEASE_NAMESPACE")
 )
 
 // Helm client
 type HelmClient struct {
-	hostIP string
+	hostIP     string
 	kubeconfig string
-	logger *logrus.Logger
+	logger     *logrus.Logger
 }
 
 // Constructor of helm client for a given host IP
@@ -47,7 +48,7 @@ func NewHelmClient(hostIP string, logger *logrus.Logger) (*HelmClient, error) {
 	if exists {
 		return &HelmClient{hostIP: hostIP, kubeconfig: kubeconfigPath + hostIP, logger: logger}, nil
 	} else {
-		logger.Errorf("No file exist with name: %s. Err: %s", kubeconfigPath + hostIP)
+		logger.Errorf("No file exist with name: %s. Err: %s", kubeconfigPath+hostIP)
 		return nil, err
 	}
 }
@@ -59,7 +60,7 @@ func (hc *HelmClient) installChart(helmPkg bytes.Buffer) (string, error) {
 	// Create temporary file to hold helm chart
 	file, err := os.Create(chartPath + "temp.tar.gz")
 	if err != nil {
-		hc.logger.Errorf("Unable to create file: %s. Err: %s", chartPath + "temp.tar.gz", err)
+		hc.logger.Errorf("Unable to create file: %s. Err: %s", chartPath+"temp.tar.gz", err)
 		return "", err
 	}
 	defer os.Remove(chartPath + "temp.tar.gz")
@@ -67,14 +68,14 @@ func (hc *HelmClient) installChart(helmPkg bytes.Buffer) (string, error) {
 	// Write input bytes to temp file
 	_, err = helmPkg.WriteTo(file)
 	if err != nil {
-		hc.logger.Errorf("Unable to write to file: %s. Err: %s", chartPath + "temp.tar.gz", err)
+		hc.logger.Errorf("Unable to write to file: %s. Err: %s", chartPath+"temp.tar.gz", err)
 		return "", err
 	}
 
 	// Load the file to chart
 	chart, err := loader.Load(chartPath + "temp.tar.gz")
 	if err != nil {
-		hc.logger.Errorf("Unable to load chart from file: %s. Err: %s", chartPath + "temp.tar.gz", err)
+		hc.logger.Errorf("Unable to load chart from file: %s. Err: %s", chartPath+"temp.tar.gz", err)
 		return "", err
 	}
 
@@ -100,12 +101,12 @@ func (hc *HelmClient) installChart(helmPkg bytes.Buffer) (string, error) {
 		hc.logger.Errorf("Unable to install chart with release name: %s. Err: %s", relName, err)
 		return "", err
 	}
-	hc.logger.Info("Successfully create chart with release name: %s", relName)
+	hc.logger.Infof("Successfully create chart with release name: %s", relName)
 	return rel.Name, err
 }
 
 // Un-Install a given helm chart
-func (hc *HelmClient) uninstallChart(relName string) (error) {
+func (hc *HelmClient) uninstallChart(relName string) error {
 	// Prepare action config and uninstall chart
 	actionConfig := new(action.Configuration)
 	if err := actionConfig.Init(kube.GetConfig(hc.kubeconfig, "", releaseNamespace), releaseNamespace,
@@ -117,17 +118,17 @@ func (hc *HelmClient) uninstallChart(relName string) (error) {
 	}
 
 	ui := action.NewUninstall(actionConfig)
-	res, err := ui.Run(relName);
+	res, err := ui.Run(relName)
 	if err != nil {
 		hc.logger.Errorf("Unable to uninstall chart with release name: %s. Err: %s", relName, err)
 		return err
 	}
-	hc.logger.Info("Successfully uninstalled chart with release name: %s. Response Info: %s", res.Release.Name, res.Info)
+	hc.logger.Infof("Successfully uninstalled chart with release name: %s. Response Info: %s", res.Release.Name, res.Info)
 	return nil
 }
 
 // Query a given chart
-func (hc *HelmClient) queryChart(relName string) (string, error)  {
+func (hc *HelmClient) queryChart(relName string) (string, error) {
 	actionConfig := new(action.Configuration)
 	if err := actionConfig.Init(kube.GetConfig(hc.kubeconfig, "", releaseNamespace), releaseNamespace,
 		os.Getenv("HELM_DRIVER"), func(format string, v ...interface{}) {
@@ -153,4 +154,4 @@ func fileExists(filename string) (bool, error) {
 		return false, err
 	}
 	return !info.IsDir(), nil
-}
\ No newline at end of file
+}