Merge pull request #1459 from aFlyBird0/check-helm-argo

fix: check argo helm repo

Author: daniel-hutao

internal/pkg/start/start.go

@@ -19,13 +19,13 @@ func Start() error {
 }
 
 func installToolsIfNotExist() error {
-	for _, t := range tool.Tools {
+	for _, t := range tool.GetTools() {
 		if !t.IfExists() {
 			if err := t.Install(); err != nil {
 				return err
 			}
 		}
-		if t.IfStopped != nil && !t.IfStopped() {
+		if t.IfStopped != nil && t.IfStopped() {
 			if err := t.Start(); err != nil {
 				return err
 			}

internal/pkg/start/tool/argocd.go

@@ -1,6 +1,15 @@
 package tool
 
-import "fmt"
+import (
+	"fmt"
+
+	"github.com/devstream-io/devstream/internal/pkg/plugin/installer/helm"
+	helmCommon "github.com/devstream-io/devstream/pkg/util/helm"
+	"github.com/devstream-io/devstream/pkg/util/k8s"
+	"github.com/devstream-io/devstream/pkg/util/types"
+
+	helmUtil "github.com/devstream-io/devstream/pkg/util/helm"
+)
 
 var toolArgocd = tool{
 	Name: "Argo CD",
@@ -14,12 +23,40 @@ var toolArgocd = tool{
 			return fmt.Errorf("user cancelled")
 		}
 
-		if err := execCommand([]string{"helm", "repo", "add", "argo", "https://argoproj.github.io/argo-helm"}); err != nil {
+		// create namespace if not exist
+		kubeClient, err := k8s.NewClient()
+		if err != nil {
 			return err
 		}
-		if err := execCommand([]string{"helm", "install", "argo/argo-cd", "-n", "argocd", "--create-namespace"}); err != nil {
+		if err = kubeClient.UpsertNameSpace("argocd"); err != nil {
 			return err
 		}
+
+		// install argocd by helm
+		argocdHelmOpts := &helm.Options{
+			Chart: helmCommon.Chart{
+				ChartPath:   "",
+				ChartName:   "argo/argo-cd",
+				Version:     "",
+				Timeout:     "10m",
+				Wait:        types.Bool(true),
+				UpgradeCRDs: types.Bool(true),
+				ReleaseName: "argocd",
+				Namespace:   "argocd",
+			},
+			Repo: helmCommon.Repo{
+				URL:  "https://argoproj.github.io/argo-helm",
+				Name: "argo",
+			},
+		}
+		h, err := helmUtil.NewHelm(argocdHelmOpts.GetHelmParam())
+		if err != nil {
+			return err
+		}
+		if err = h.InstallOrUpgradeChart(); err != nil {
+			return err
+		}
+
 		return nil
 	},
 }

internal/pkg/start/tool/tool.go

@@ -14,8 +14,6 @@ type tool struct {
 	Start     startFunc
 }
 
-var Tools []tool
-
-func init() {
-	Tools = []tool{toolDocker, toolMinikube, toolHelm, toolArgocd}
+func GetTools() []tool {
+	return []tool{toolDocker, toolMinikube, toolHelm, toolArgocd}
 }