Merge pull request #47 from PatrickLaabs/merging

many modifications..

Author: PatrickLaabs

.github/workflows/goreleaser.yaml

@@ -45,3 +45,8 @@ jobs:
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      - name: Upload Release Assets
+        uses: actions/upload-artifact@v3
+        with:
+          name: release-assets
+          path: ./templates/*.yaml

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

@@ -17,8 +17,11 @@ import (
 	"github.com/PatrickLaabs/frigg/pkg/common/kubeconfig"
 	"github.com/PatrickLaabs/frigg/pkg/common/postbootstrap"
 	"github.com/PatrickLaabs/frigg/pkg/common/sshkey"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/PatrickLaabs/frigg/pkg/common/wait"
+	"github.com/PatrickLaabs/frigg/tmpl/clusterctlconfig"
 	"github.com/PatrickLaabs/frigg/tmpl/helmchartsproxies"
+	"github.com/PatrickLaabs/frigg/tmpl/kindconfig"
 	"github.com/PatrickLaabs/frigg/tmpl/mgmtmanifestgen"
 	"github.com/fatih/color"
 	"io"
@@ -47,13 +50,13 @@ type flagpole struct {
 
 // NewCommand returns a new cobra.Command for cluster creation
 func NewCommand(logger log.Logger, streams cmd.IOStreams) *cobra.Command {
-	homedir, _ := os.UserHomeDir()
-
-	friggDirName := ".frigg"
-	kubeconfigName := "bootstrapcluster.kubeconfig"
-
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + kubeconfigName
+	homedir, err := os.UserHomeDir()
+	if err != nil {
+		println(color.RedString("error on accessing users home directory: %v\n", err))
+	}
 
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.BootstrapkubeconfigName
+	kindconfigPath := homedir + "/" + vars.FriggDirName + "/" + vars.KindconfigName
 	flags := &flagpole{}
 	c := &cobra.Command{
 		Args:  cobra.NoArgs,
@@ -75,7 +78,7 @@ func NewCommand(logger log.Logger, streams cmd.IOStreams) *cobra.Command {
 	c.Flags().StringVar(
 		&flags.Config,
 		"config",
-		"templates/kind-config.yaml",
+		kindconfigPath,
 		"path to a kind config file",
 	)
 	c.Flags().StringVar(
@@ -132,9 +135,24 @@ func runE(logger log.Logger, streams cmd.IOStreams, flags *flagpole) error {
 	}
 
 	// Create working directory named .frigg inside the users homedirectory.
-	println(color.YellowString("Creating working directory on your homedirectory"))
 	workdir.CreateDir()
 
+	// Generating kind-config
+	kindconfig.KindConfigGen()
+
+	// Generating clusterctl config
+	clusterctlconfig.ClusterctlConfigGen()
+
+	// Generating HelmChartProxies
+	helmchartsproxies.Cni()
+	helmchartsproxies.Vault()
+	helmchartsproxies.ArgoCDWorkloadClusters()
+	helmchartsproxies.ArgoWorkflows()
+	helmchartsproxies.ArgoRollouts()
+	helmchartsproxies.ArgoEvents()
+	helmchartsproxies.MgmtArgoCD()
+	helmchartsproxies.MgmtArgoApps()
+
 	provider := cluster.NewProvider(
 		cluster.ProviderWithLogger(logger),
 		runtime.GetDefault(logger),
@@ -235,10 +253,6 @@ func runE(logger log.Logger, streams cmd.IOStreams, flags *flagpole) error {
 	// and to free up some hardware resources.
 	postbootstrap.DeleteBootstrapcluster()
 
-	// Generating HelmChartProxies
-	helmchartsproxies.MgmtArgoCD()
-	helmchartsproxies.MgmtArgoApps()
-
 	// Installs the HelmChartProxies onto the mgmt-cluster
 	argocdWorkload.Installation()
 	cni.Installation()

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

@@ -2,6 +2,7 @@ package clusterapi
 
 import (
 	"fmt"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -16,9 +17,9 @@ func KubectlApplyMgmt() {
 		return
 	}
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + bootstrapkubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.BootstrapkubeconfigName
 
-	mgmtcluster := homedir + "/" + friggDirName + "/" + "argohubmgmtclusterManifest.yaml"
+	mgmtcluster := homedir + "/" + vars.FriggDirName + "/" + vars.MgmtManifest
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",
@@ -44,13 +45,13 @@ func KubectlApplyWorkload() {
 		return
 	}
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
 
-	mgmtcluster := homedir + "/" + friggDirName + "/" + "workloadcluster.yaml"
+	workloadcluster := homedir + "/" + vars.FriggDirName + "/" + vars.WorkloadManifest
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",
-		"-f", mgmtcluster,
+		"-f", workloadcluster,
 	)
 
 	// Capture the output of the command
@@ -91,7 +92,7 @@ func ApplyGithubSecretMgmt() {
 	}
 
 	fromLiteralString := "--from-literal=token=" + token
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "-n", "argo", "create", "secret", "generic",
@@ -116,7 +117,7 @@ func ApplyArgoSecretMgmt() {
 		return
 	}
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "-n", "argo", "create", "secret", "generic",
@@ -143,7 +144,7 @@ func CreateArgoNSMgmt() {
 		return
 	}
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "create", "namespace", "argo",
@@ -167,7 +168,7 @@ func CreateArgoNSWorkload() {
 		return
 	}
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + workloadKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.WorkloadKubeconfigName
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "create", "namespace", "argo",

cmd/frigg/bootstrap/capd/clusterapi/apply.go

@@ -1,6 +1,7 @@
 package clusterapi
 
 import (
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -15,9 +16,9 @@ func ClusterAPI() {
 		return
 	}
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + bootstrapkubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.BootstrapkubeconfigName
+	clusterconfigPath := homedir + "/" + vars.FriggDirName + "/" + vars.ClusterctlConfigName
 
-	// Installs CAPI v1.6.1, Docker and CAAPH v0.1.1-alpha.0
 	cmd := exec.Command("clusterctl", "init",
 		"--bootstrap", "kubeadm:v1.6.1",
 		"--control-plane", "kubeadm:v1.6.1",
@@ -27,7 +28,7 @@ func ClusterAPI() {
 		"--addon", "helm:v0.1.1-alpha.0",
 		"--kubeconfig", kubeconfigFlagPath,
 		"--wait-providers",
-		"--config", "templates/clusterctl-config.yaml",
+		"--config", clusterconfigPath,
 	)
 
 	// Capture the output of the command
@@ -48,10 +49,9 @@ func ClusterAPIMgmt() {
 		return
 	}
 
-	// /home/patricklaabs/.frigg/frigg-cluster.kubeconfig
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
+	clusterconfigPath := homedir + "/" + vars.FriggDirName + "/" + vars.ClusterctlConfigName
 
-	// Installs CAPI v1.6.1, Docker and CAAPH v0.1.1-alpha.0
 	cmd := exec.Command("clusterctl", "init",
 		"--bootstrap", "kubeadm:v1.6.1",
 		"--control-plane", "kubeadm:v1.6.1",
@@ -61,7 +61,7 @@ func ClusterAPIMgmt() {
 		"--addon", "helm:v0.1.1-alpha.0",
 		"--kubeconfig", kubeconfigFlagPath,
 		"--wait-providers",
-		"--config", "templates/clusterctl-config.yaml",
+		"--config", clusterconfigPath,
 	)
 
 	// Capture the output of the command

cmd/frigg/bootstrap/capd/clusterapi/clusterapi.go

@@ -1,6 +1,7 @@
 package clusterapi
 
 import (
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -15,9 +16,9 @@ func Pivot() {
 		return
 	}
 
-	bootstrapKubeconfig := homedir + "/" + friggDirName + "/" + bootstrapkubeconfigName
+	bootstrapKubeconfig := homedir + "/" + vars.FriggDirName + "/" + vars.BootstrapkubeconfigName
 
-	mgmtKubeconfig := homedir + "/" + friggDirName + "/" + managementKubeconfigName
+	mgmtKubeconfig := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
 
 	cmd := exec.Command("clusterctl", "--kubeconfig", bootstrapKubeconfig,
 		"move", "--to-kubeconfig", mgmtKubeconfig,

cmd/frigg/bootstrap/capd/clusterapi/privot.go

@@ -1,7 +1,7 @@
 package argocdWorkload
 
 import (
-	"github.com/PatrickLaabs/frigg/cmd/frigg/bootstrap/capd/helmchartproxies"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -16,12 +16,9 @@ func Installation() {
 		return
 	}
 
-	friggDirName := helmchartproxies.FriggDirName
-	managementKubeconfigName := helmchartproxies.ManagementKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
-
-	helmchartManifests := "templates/helmchartproxies/argocd-workload-clusters.yaml"
+	helmchartManifests := homedir + "/" + vars.FriggDirName + "/" + vars.ArgoCDWorkload
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",

cmd/frigg/bootstrap/capd/clusterapi/vars.go

@@ -1,7 +1,7 @@
 package cni
 
 import (
-	"github.com/PatrickLaabs/frigg/cmd/frigg/bootstrap/capd/helmchartproxies"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -16,12 +16,9 @@ func Installation() {
 		return
 	}
 
-	friggDirName := helmchartproxies.FriggDirName
-	managementKubeconfigName := helmchartproxies.ManagementKubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
-
-	helmchartManifests := "templates/helmchartproxies/cni.yaml"
+	helmchartManifests := homedir + "/" + vars.FriggDirName + "/" + vars.CniName
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",

cmd/frigg/bootstrap/capd/helmchartproxies/argocdWorkload/argocdWorkload.go

@@ -1,7 +1,7 @@
 package cnibootstrap
 
 import (
-	"github.com/PatrickLaabs/frigg/cmd/frigg/bootstrap/capd/helmchartproxies"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -16,12 +16,9 @@ func Installation() {
 		return
 	}
 
-	friggDirName := helmchartproxies.FriggDirName
-	bootstrapkubeconfigName := helmchartproxies.BootstrapkubeconfigName
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.BootstrapkubeconfigName
 
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + bootstrapkubeconfigName
-
-	helmchartManifests := "templates/helmchartproxies/cni.yaml"
+	helmchartManifests := homedir + "/" + vars.FriggDirName + "/" + vars.CniName
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",

cmd/frigg/bootstrap/capd/helmchartproxies/cni/cni.go

@@ -1,7 +1,7 @@
 package mgmtArgocdApps
 
 import (
-	"github.com/PatrickLaabs/frigg/cmd/frigg/bootstrap/capd/helmchartproxies"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -16,15 +16,8 @@ func Installation() {
 		return
 	}
 
-	friggDirName := helmchartproxies.FriggDirName
-	friggDir := homedir + "/" + friggDirName
-	managementKubeconfigName := helmchartproxies.ManagementKubeconfigName
-
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
-
-	//helmchartManifests := "templates/helmchartproxies/mgmt-argocd-apps.yaml"
-	newFile := "mgmt-argocd-apps.yaml"
-	helmchartManifests := friggDir + "/" + newFile
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
+	helmchartManifests := homedir + "/" + vars.FriggDirName + "/" + vars.ArgoCDAppsMgmt
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",

cmd/frigg/bootstrap/capd/helmchartproxies/cnibootstrap/cni.go

@@ -1,7 +1,7 @@
 package mgmtArgocdEvents
 
 import (
-	"github.com/PatrickLaabs/frigg/cmd/frigg/bootstrap/capd/helmchartproxies"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -16,12 +16,8 @@ func Installation() {
 		return
 	}
 
-	friggDirName := helmchartproxies.FriggDirName
-	managementKubeconfigName := helmchartproxies.ManagementKubeconfigName
-
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
-
-	helmchartManifests := "templates/helmchartproxies/mgmt-argocd-events.yaml"
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
+	helmchartManifests := homedir + "/" + vars.FriggDirName + "/" + vars.ArgoEventsMgmt
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",

cmd/frigg/bootstrap/capd/helmchartproxies/mgmtArgocdApps/mgmtArgocdApps.go

@@ -1,7 +1,7 @@
 package mgmtArgocdRollouts
 
 import (
-	"github.com/PatrickLaabs/frigg/cmd/frigg/bootstrap/capd/helmchartproxies"
+	"github.com/PatrickLaabs/frigg/pkg/common/vars"
 	"github.com/fatih/color"
 	"os"
 	"os/exec"
@@ -16,12 +16,8 @@ func Installation() {
 		return
 	}
 
-	friggDirName := helmchartproxies.FriggDirName
-	managementKubeconfigName := helmchartproxies.ManagementKubeconfigName
-
-	kubeconfigFlagPath := homedir + "/" + friggDirName + "/" + managementKubeconfigName
-
-	helmchartManifests := "templates/helmchartproxies/mgmt-argocd-rollouts.yaml"
+	kubeconfigFlagPath := homedir + "/" + vars.FriggDirName + "/" + vars.ManagementKubeconfigName
+	helmchartManifests := homedir + "/" + vars.FriggDirName + "/" + vars.ArgoRolloutsMgmt
 
 	cmd := exec.Command("kubectl", "--kubeconfig",
 		kubeconfigFlagPath, "apply",