overall improvements on how manifest gets rendered and stored on disk

Author: PatrickLaabs

.github/workflows/goreleaser.yaml

@@ -44,9 +44,4 @@ jobs:
           version: latest
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-      - name: Upload assets
-        uses: actions/upload-artifact@v3
-        with:
-          name: argohubmgmtclusterManifest.yaml
-          path: templates/*.yaml
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

cmd/frigg/bootstrap/capd/cluster/cluster.go

@@ -153,6 +153,13 @@ func runE(logger log.Logger, streams cmd.IOStreams, flags *flagpole) error {
 	helmchartsproxies.MgmtArgoCD()
 	helmchartsproxies.MgmtArgoApps()
 
+	// Generates a manifest for the management cluster, named frigg-mgmt-cluster
+	wait.Wait(10 * time.Second)
+	mgmtmanifestgen.Gen()
+
+	// Generating SSH Key pair
+	sshkey.KeypairGen()
+
 	provider := cluster.NewProvider(
 		cluster.ProviderWithLogger(logger),
 		runtime.GetDefault(logger),
@@ -178,9 +185,6 @@ func runE(logger log.Logger, streams cmd.IOStreams, flags *flagpole) error {
 		return errors.Wrap(err, "failed to create cluster")
 	}
 
-	// Generating SSH Key pair
-	sshkey.KeypairGen()
-
 	// Rendering gitops repo
 	reporender.FullStage()
 
@@ -194,10 +198,6 @@ func runE(logger log.Logger, streams cmd.IOStreams, flags *flagpole) error {
 	wait.Wait(10 * time.Second)
 	cnibootstrap.Installation()
 
-	// Generates a manifest for the management cluster, named frigg-mgmt-cluster
-	wait.Wait(10 * time.Second)
-	mgmtmanifestgen.Gen()
-
 	// Applies the frigg-mgmt-cluster manifest to the bootstrap cluster
 	// to create the first 'real' management cluster
 	wait.Wait(5 * time.Second)

cmd/frigg/version/version.go

@@ -54,11 +54,11 @@ func DisplayVersion() string {
 }
 
 // versionCore is the core portion of the frigg CLI version per Semantic Versioning 2.0.0
-const versionCore = "0.4.0"
+const versionCore = "1.0.0"
 
 // versionPreRelease is the base pre-release portion of the kind CLI version per
 // Semantic Versioning 2.0.0
-const versionPreRelease = "alpha"
+const versionPreRelease = ""
 
 // gitCommitCount count the commits since the last release.
 // It is injected at build time.

pkg/common/vars/vars.go

@@ -20,3 +20,5 @@ var ArgoEventsMgmt = "mgmt-argocd-events.yaml"
 var ArgoWorkflowsMgmt = "mgmt-argocd-workflows.yaml"
 var MgmtManifest = "argohubmgmtclusterManifest.yaml"
 var WorkloadManifest = "workloadcluster.yaml"
+var CurlMgmtManifest = "https://raw.githubusercontent.com/PatrickLaabs/frigg/main/templates/argohubmgmtclusterManifest.yaml"
+var CurlWorkloadManifest = "https://raw.githubusercontent.com/PatrickLaabs/frigg/main/templates/workloadcluster.yaml"

tmpl/helmchartsproxies/helmchartproxies.go

@@ -951,7 +951,7 @@ func MgmtArgoApps() {
     project: default
     source:
       repoURL: ` + url + `
-      path: path: clusters/management-cluster/argocd
+      path: clusters/management-cluster/argocd
       targetRevision: main
     destination:
       server: https://kubernetes.default.svc

tmpl/mgmtmanifestgen/mgmtmanifestgen.go

@@ -1,36 +1,34 @@
 package mgmtmanifestgen
 
 import (
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
-	"gopkg.in/yaml.v3"
 	"os"
+	"os/exec"
 )
 
 func Gen() {
-	homedir, _ := os.UserHomeDir()
+	println(color.YellowString("Getting Management Clusters Manifest from Github"))
 
-	friggDirname := ".frigg"
-
-	tmplmanifest := "templates/argohubmgmtclusterManifest.yaml"
-	outputmanifestName := "argohubmgmtclusterManifest.yaml"
-	outputPath := homedir + "/" + friggDirname + "/" + outputmanifestName
-
-	var manifest map[string]interface{}
-
-	yamlFile, err := os.ReadFile(tmplmanifest)
+	homedir, err := os.UserHomeDir()
 	if err != nil {
-		println(color.RedString("Error Reading file: %v\n", err))
+		println(color.RedString("error on accessing home directory: %v\n", err))
 	}
 
-	err = yaml.Unmarshal(yamlFile, &manifest)
-	if err != nil {
-		println(color.RedString("Error unmarshaling yaml: %v\n", err))
-	}
+	// https://raw.githubusercontent.com/PatrickLaabs/frigg/main/templates/argohubmgmtclusterManifest.yaml
+
+	outputPath := homedir + "/" + vars.FriggDirName + "/" + vars.MgmtManifest
+
+	cmd := exec.Command("curl", "-L", "-o", outputPath,
+		vars.CurlMgmtManifest,
+	)
 
-	err = os.WriteFile(outputPath, yamlFile, 0755)
+	output, err := cmd.CombinedOutput()
 	if err != nil {
-		println(color.RedString("Error writing file: %v\n", err))
+		println(color.YellowString(string(output)))
+		return
 	}
+	println(color.GreenString("Successfully written Workload Cluster Kubernets Manifest"))
 
 	println(color.GreenString("Successfully written Mgmt Kubernets Manifest"))
 }

tmpl/workloadmanifestgen/workloadmanifestgen.go

@@ -1,36 +1,29 @@
 package workloadmanifestgen
 
 import (
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
-	"gopkg.in/yaml.v3"
 	"os"
+	"os/exec"
 )
 
 func Gen() {
-	homedir, _ := os.UserHomeDir()
-
-	friggDirname := ".frigg"
-
-	tmplmanifest := "templates/workloadcluster.yaml"
-	outputmanifestName := "workloadcluster.yaml"
-	outputPath := homedir + "/" + friggDirname + "/" + outputmanifestName
-
-	var manifest map[string]interface{}
-
-	yamlFile, err := os.ReadFile(tmplmanifest)
+	homedir, err := os.UserHomeDir()
 	if err != nil {
-		println(color.RedString("Error Reading file: %v\n", err))
+		println(color.RedString("error on accessing home directory: %v\n", err))
 	}
 
-	err = yaml.Unmarshal(yamlFile, &manifest)
-	if err != nil {
-		println(color.RedString("Error unmarshaling yaml: %v\n", err))
-	}
+	// curl -L -o workloadcluster.yaml https://raw.githubusercontent.com/PatrickLaabs/frigg/main/templates/workloadcluster.yaml
+	outputPath := homedir + "/" + vars.FriggDirName + "/" + vars.WorkloadManifest
 
-	err = os.WriteFile(outputPath, yamlFile, 0755)
+	cmd := exec.Command("curl", "-L", "-o", outputPath,
+		vars.CurlWorkloadManifest,
+	)
+
+	output, err := cmd.CombinedOutput()
 	if err != nil {
-		println(color.RedString("Error writing file: %v\n", err))
+		println(color.YellowString(string(output)))
+		return
 	}
-
 	println(color.GreenString("Successfully written Workload Cluster Kubernets Manifest"))
 }