From b48e9fb292cf6adc3d4d9163fd2c513e9c374a91 Mon Sep 17 00:00:00 2001 From: Christian Hernandez Date: Mon, 14 Mar 2022 17:16:04 -0700 Subject: [PATCH] Updated to Argo CD v2.3.1 Signed-off-by: Christian Hernandez --- cmd/root.go | 2 +- cmd/templates/templates.go | 6 ++---- cmd/templates/templatestypes.go | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 8813bcf..e8aa68c 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -17,7 +17,7 @@ var CapiCfg string // rootCmd represents the base command when called without any subcommands var rootCmd = &cobra.Command{ Use: "gokp", - Version: "v0.0.7-1", + Version: "v0.0.8", Short: "GOKP installs a GitOps ready Kubernetes cluster", Long: `GOKP creates a Kubernetes cluster using CAPI. It is meant to be a GitOps native Kubernetes cluster ready to use. diff --git a/cmd/templates/templates.go b/cmd/templates/templates.go index e86caaf..81ae799 100644 --- a/cmd/templates/templates.go +++ b/cmd/templates/templates.go @@ -40,11 +40,9 @@ func CreateArgoRepoSkel(name *string, workdir string, ghtoken string, gitopsrepo if strings.Contains(dir, "bootstrap") && strings.Contains(dir, "base") { // Set up the vars to go into the template argocdinstall := struct { - ArgocdVer string - AppsetVers string + ArgocdVer string }{ - ArgocdVer: "stable", - AppsetVers: "stable", + ArgocdVer: "stable", } // Write out the kustomization file based on the vars and the template diff --git a/cmd/templates/templatestypes.go b/cmd/templates/templatestypes.go index 7865257..33a953e 100644 --- a/cmd/templates/templatestypes.go +++ b/cmd/templates/templatestypes.go @@ -4197,7 +4197,6 @@ namespace: argocd resources: - argocd-ns.yaml - https://raw.githubusercontent.com/argoproj/argo-cd/{{.ArgocdVer}}/manifests/install.yaml -- https://raw.githubusercontent.com/argoproj-labs/applicationset/{{.AppsetVers}}/manifests/install.yaml ` var ArgoCdNameSpaceFile string = `apiVersion: v1