From 892b1708218bdfd36f768c3b5624f880bd187a73 Mon Sep 17 00:00:00 2001 From: Patrick Laabs Date: Sat, 16 Mar 2024 11:06:56 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20fixing=20namings=20for=20?= =?UTF-8?q?cli=20binaries=20(#99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/frigg/bootstrap/commons/clusterapi/clusterapi.go | 2 +- cmd/frigg/bootstrap/commons/clusterapi/privot.go | 2 -- cmd/frigg/bootstrap/commons/reporender/reporender.go | 2 +- pkg/kubeconfig/kubeconfig.go | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmd/frigg/bootstrap/commons/clusterapi/clusterapi.go b/cmd/frigg/bootstrap/commons/clusterapi/clusterapi.go index 189c4dd..883e6d1 100644 --- a/cmd/frigg/bootstrap/commons/clusterapi/clusterapi.go +++ b/cmd/frigg/bootstrap/commons/clusterapi/clusterapi.go @@ -9,7 +9,7 @@ import ( "path/filepath" ) -var clusterctl = "clusterctl" + consts.ClusterctlVersion +var clusterctl = "clusterctl_" + consts.ClusterctlVersion func ClusterAPI() { homedir, err := os.UserHomeDir() diff --git a/cmd/frigg/bootstrap/commons/clusterapi/privot.go b/cmd/frigg/bootstrap/commons/clusterapi/privot.go index b1c31fb..a01b753 100644 --- a/cmd/frigg/bootstrap/commons/clusterapi/privot.go +++ b/cmd/frigg/bootstrap/commons/clusterapi/privot.go @@ -8,8 +8,6 @@ import ( "path/filepath" ) -// var clusterctl = "clusterctl" + consts.ClusterctlVersion - func Pivot() { println(color.GreenString("Moving clusterapi components from bootstrap to mgmt cluster..")) diff --git a/cmd/frigg/bootstrap/commons/reporender/reporender.go b/cmd/frigg/bootstrap/commons/reporender/reporender.go index f28b32c..50dc1cc 100644 --- a/cmd/frigg/bootstrap/commons/reporender/reporender.go +++ b/cmd/frigg/bootstrap/commons/reporender/reporender.go @@ -15,7 +15,7 @@ import ( "time" ) -var gh = "gh" + consts.GithubCliVersion +var gh = "gh_" + consts.GithubCliVersion // FullStage combines everything, that is needed, to fully prepare the gitops repo for the end-user func FullStage() { diff --git a/pkg/kubeconfig/kubeconfig.go b/pkg/kubeconfig/kubeconfig.go index 3555ec2..ab346d4 100644 --- a/pkg/kubeconfig/kubeconfig.go +++ b/pkg/kubeconfig/kubeconfig.go @@ -13,7 +13,7 @@ import ( "strings" ) -var clusterctl = "clusterctl" + consts.ClusterctlVersion +var clusterctl = "clusterctl_" + consts.ClusterctlVersion // RetrieveMgmtKubeconfig retrieves of the newly provisioned mgmt-cluster via capd // and stores it to the work directory of frigg