fix,feat: argo restart for k3d and argo upgrade (#413)

konstructio · Aug 28, 2024 · d45d161 · d45d161
1 parent 565788f
commit d45d161
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/internal/argocd/auth.go b/internal/argocd/auth.go
@@ -93,6 +93,8 @@ func GetArgocdTokenV2(httpClient *http.Client, argocdBaseURL string, username st
 		return "", err
 	}
 
+	req.Header.Set("Content-Type", "application/json")
+
 	res, err := httpClient.Do(req)
 	if err != nil {
 		return "", err

diff --git a/internal/constants.go b/internal/constants.go
@@ -37,7 +37,7 @@ const (
 	MinioDefaultPassword         = "feedkraystars"
 
 	// github.com/kubefirst/manifests ref ver
-	KubefirstManifestRepoRef = "0.1.0"
+	KubefirstManifestRepoRef = "v1.1.0"
 )
 
 // Vault

diff --git a/internal/controller/argocd.go b/internal/controller/argocd.go
@@ -46,14 +46,7 @@ func (clctrl *ClusterController) InstallArgoCD() error {
 			}
 		}
 
-		var argoCDInstallPath string
-
-		switch clctrl.CloudProvider {
-		case "digitalocean", "aws", "civo", "google", "vultr", "akamai":
-			argoCDInstallPath = "github.com:konstructio/manifests/argocd/cloud?ref=v1.1.0"
-		default:
-			argoCDInstallPath = fmt.Sprintf("github.com:kubefirst/manifests/argocd/cloud?ref=%s", pkg.KubefirstManifestRepoRef)
-		}
+		argoCDInstallPath := fmt.Sprintf("github.com:konstructio/manifests/argocd/cloud?ref=%s", pkg.KubefirstManifestRepoRef)
 
 		log.Info().Msg("installing argocd")
 

diff --git a/pkg/k3d/k3d.go b/pkg/k3d/k3d.go
@@ -1,6 +1,9 @@
 package k3d
 
-import internal "github.com/konstructio/kubefirst-api/internal/k3d"
+import (
+	"github.com/konstructio/kubefirst-api/internal/controller"
+	internal "github.com/konstructio/kubefirst-api/internal/k3d"
+)
 
 const DomainName = internal.DomainName
 const GithubHost = internal.GithubHost
@@ -29,3 +32,4 @@ var DeleteK3dCluster = internal.DeleteK3dCluster
 var GenerateSingleTLSSecret = internal.GenerateSingleTLSSecret
 
 var ClusterCreateConsoleAPI = internal.ClusterCreateConsoleAPI
+var RestartDeployment = controller.RestartDeployment