Taking kubeconfig flag into account (#328)

danielm-codefresh · web-flow · commit 4b815d0d2948 · 2022-03-24T08:54:27.000+02:00
* Taking kubeconfig flag into account

* remove todo
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.0.293
+VERSION=v0.0.294
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
diff --git a/cmd/commands/cluster.go b/cmd/commands/cluster.go
@@ -37,6 +37,7 @@ type (
 	ClusterAddOptions struct {
 		runtimeName string
 		kubeContext string
+		kubeconfig  string
 		dryRun      bool
 		kubeFactory kube.Factory
 	}
@@ -84,7 +85,7 @@ func NewClusterAddCommand() *cobra.Command {
 				return err
 			}
 
-			opts.kubeContext, err = ensureKubeContextName(cmd.Flag("context"))
+			opts.kubeContext, err = ensureKubeContextName(cmd.Flag("context"), cmd.Flag("kubeconfig"))
 			return err
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -119,7 +120,7 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {
 	}
 
 	ingressUrl := *runtime.IngressHost
-	server, err := util.KubeServerByContextName(opts.kubeContext)
+	server, err := util.KubeServerByContextName(opts.kubeContext, opts.kubeconfig)
 	if err != nil {
 		return fmt.Errorf("failed getting server for context \"%s\": %w", opts.kubeContext, err)
 	}
@@ -201,20 +202,21 @@ func NewClusterListCommand() *cobra.Command {
 			return err
 		},
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			return runClusterList(cmd.Context(), runtimeName)
+			kubeconfig := cmd.Flag("kubeconfig").Value.String()
+			return runClusterList(cmd.Context(), runtimeName, kubeconfig)
 		},
 	}
 
 	return cmd
 }
 
-func runClusterList(ctx context.Context, runtimeName string) error {
+func runClusterList(ctx context.Context, runtimeName, kubeconfig string) error {
 	runtime, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)
 	if err != nil {
 		return err
 	}
 
-	kubeContext, err := util.KubeContextNameByServer(*runtime.Cluster)
+	kubeContext, err := util.KubeContextNameByServer(*runtime.Cluster, kubeconfig)
 	if err != nil {
 		return fmt.Errorf("failed getting context for \"%s\": %w", *runtime.Cluster, err)
 	}
diff --git a/cmd/commands/common.go b/cmd/commands/common.go
@@ -362,23 +362,25 @@ func promptSummaryToUser(ctx context.Context, finalParameters map[string]string,
 	return false, nil
 }
 
-func ensureKubeContextName(flag *pflag.Flag) (string, error) {
-	contextName, err := getKubeContextName(flag)
+func ensureKubeContextName(context, kubeconfig *pflag.Flag) (string, error) {
+	contextName, err := getKubeContextName(context, kubeconfig)
 	if err != nil {
 		return "", err
 	}
 
 	if contextName == "" {
-		return "", fmt.Errorf("must supply value for \"%s\"", flag.Name)
+		return "", fmt.Errorf("must supply value for \"%s\"", context.Name)
 	}
 
 	return contextName, nil
 }
 
-func getKubeContextName(flag *pflag.Flag) (string, error) {
-	contextName := flag.Value.String()
+func getKubeContextName(context, kubeconfig *pflag.Flag) (string, error) {
+	kubeconfigPath := kubeconfig.Value.String()
+
+	contextName := context.Value.String()
 	if contextName != "" {
-		if !util.CheckExistingContext(contextName) {
+		if !util.CheckExistingContext(contextName, kubeconfigPath) {
 			return "", fmt.Errorf("kubeconfig file missing context \"%s\"", contextName)
 		}
 
@@ -387,22 +389,22 @@ func getKubeContextName(flag *pflag.Flag) (string, error) {
 
 	if !store.Get().Silent {
 		var err error
-		contextName, err = getKubeContextNameFromUserSelect()
+		contextName, err = getKubeContextNameFromUserSelect(kubeconfigPath)
 		if err != nil {
 			return "", err
 		}
 	}
 
-	return contextName, flag.Value.Set(contextName)
+	return contextName, context.Value.Set(contextName)
 }
 
 type SelectItem struct {
 	Value string
 	Label string
 }
 
-func getKubeContextNameFromUserSelect() (string, error) {
-	contexts := util.KubeContexts()
+func getKubeContextNameFromUserSelect(kubeconfig string) (string, error) {
+	contexts := util.KubeContexts(kubeconfig)
 	templates := &promptui.SelectTemplates{
 		Active:   "▸ {{ .Name }} {{if .Current }}(current){{end}}",
 		Inactive: "  {{ .Name }} {{if .Current }}(current){{end}}",
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -98,6 +98,7 @@ type (
 		CommonConfig                   *runtime.CommonConfig
 		versionStr                     string
 		kubeContext                    string
+		kubeconfig                     string
 	}
 
 	RuntimeUninstallOptions struct {
@@ -276,6 +277,7 @@ func NewRuntimeInstallCommand() *cobra.Command {
 	}
 
 	installationOpts.KubeFactory = kube.AddFlags(cmd.Flags())
+	installationOpts.kubeconfig = cmd.Flag("kubeconfig").Value.String()
 
 	util.Die(cmd.Flags().MarkHidden("bypass-ingress-class-check"))
 
@@ -310,7 +312,7 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 		return err
 	}
 
-	opts.kubeContext, err = getKubeContextName(cmd.Flag("context"))
+	opts.kubeContext, err = getKubeContextName(cmd.Flag("context"), cmd.Flag("kubeconfig"))
 	handleCliStep(reporter.InstallStepPreCheckGetKubeContext, "Getting kube context name", err, true, false)
 	if err != nil {
 		return err
@@ -373,7 +375,7 @@ func runtimeUninstallCommandPreRunHandler(cmd *cobra.Command, args []string, opt
 	var err error
 	handleCliStep(reporter.UninstallPhasePreCheckStart, "Starting pre checks", nil, true, false)
 
-	opts.kubeContext, err = getKubeContextName(cmd.Flag("context"))
+	opts.kubeContext, err = getKubeContextName(cmd.Flag("context"), cmd.Flag("kubeconfig"))
 	handleCliStep(reporter.UninstallStepPreCheckGetKubeContext, "Getting kube context name", err, true, false)
 	if err != nil {
 		return err
@@ -738,7 +740,7 @@ func runtimeInstallPreparations(opts *RuntimeInstallOptions) (*runtime.Runtime,
 		return nil, "", fmt.Errorf("failed to download runtime definition: %w", err)
 	}
 
-	server, err := util.KubeCurrentServer()
+	server, err := util.KubeCurrentServer(opts.kubeconfig)
 	handleCliStep(reporter.InstallStepGetServerAddress, "Getting current server address", err, false, true)
 	if err != nil {
 		return nil, "", fmt.Errorf("failed to get current server address: %w", err)
diff --git a/docs/releases/release_notes.md b/docs/releases/release_notes.md
@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.293/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.294/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.293/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.294/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
diff --git a/manifests/runtime.yaml b/manifests/runtime.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.293
+  version: 0.0.294
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -167,8 +167,11 @@ func EscapeAppsetFieldName(field string) string {
 	return appsetFieldRegexp.ReplaceAllString(field, "_")
 }
 
-func kubeConfig() *clientcmdapi.Config {
+func kubeConfig(kubeconfig string) *clientcmdapi.Config {
 	configAccess := clientcmd.NewDefaultPathOptions()
+	if kubeconfig != "" {
+		configAccess.GlobalFile = kubeconfig
+	}
 	conf, err := configAccess.GetStartingConfig()
 	Die(err, "failed reading kubeconfig file")
 	return conf
@@ -179,8 +182,8 @@ type kubeContext struct {
 	Current bool
 }
 
-func KubeContexts() []kubeContext {
-	conf := kubeConfig()
+func KubeContexts(kubeconfig string) []kubeContext {
+	conf := kubeConfig(kubeconfig)
 	contexts := make([]kubeContext, len(conf.Contexts))
 	i := 0
 	for key := range conf.Contexts {
@@ -208,8 +211,8 @@ func KubeContexts() []kubeContext {
 	return contexts
 }
 
-func CheckExistingContext(contextName string) bool {
-	for _, context := range KubeContexts() {
+func CheckExistingContext(contextName, kubeconfig string) bool {
+	for _, context := range KubeContexts(kubeconfig) {
 		if context.Name == contextName {
 			return true
 		}
@@ -218,8 +221,8 @@ func CheckExistingContext(contextName string) bool {
 	return false
 }
 
-func KubeCurrentServer() (string, error) {
-	return KubeServerByContextName("")
+func KubeCurrentServer(kubeconfig string) (string, error) {
+	return KubeServerByContextName("", kubeconfig)
 }
 
 func CurrentAccount(user *codefresh.User) (string, error) {
@@ -255,8 +258,8 @@ func OpenBrowserForGitLogin(ingressHost string, user string, account string) err
 	return nil
 }
 
-func KubeContextNameByServer(server string) (string, error) {
-	conf := kubeConfig()
+func KubeContextNameByServer(server, kubeconfig string) (string, error) {
+	conf := kubeConfig(kubeconfig)
 	for contextName, context := range conf.Contexts {
 		if cluster, ok := conf.Clusters[context.Cluster]; ok {
 			if cluster.Server == server {
@@ -268,8 +271,8 @@ func KubeContextNameByServer(server string) (string, error) {
 	return "", fmt.Errorf("Context not found for server \"%s\"", server)
 }
 
-func KubeServerByContextName(contextName string) (string, error) {
-	conf := kubeConfig()
+func KubeServerByContextName(contextName, kubeconfig string) (string, error) {
+	conf := kubeConfig(kubeconfig)
 	if contextName == "" {
 		contextName = conf.CurrentContext
 	}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.0.293`
	`1`	`+VERSION=v0.0.294`
`2`	`2`
`3`	`3`	`OUT_DIR=dist`
`4`	`4`	`YEAR?=$(shell date +"%Y")`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ type (`
`37`	`37`	`ClusterAddOptions struct {`
`38`	`38`	`runtimeName string`
`39`	`39`	`kubeContext string`
	`40`	`+ kubeconfig string`
`40`	`41`	`dryRun bool`
`41`	`42`	`kubeFactory kube.Factory`
`42`	`43`	`}`
`@@ -84,7 +85,7 @@ func NewClusterAddCommand() *cobra.Command {`
`84`	`85`	`return err`
`85`	`86`	`}`
`86`	`87`
`87`		`- opts.kubeContext, err = ensureKubeContextName(cmd.Flag("context"))`
	`88`	`+ opts.kubeContext, err = ensureKubeContextName(cmd.Flag("context"), cmd.Flag("kubeconfig"))`
`88`	`89`	`return err`
`89`	`90`	`},`
`90`	`91`	`RunE: func(cmd *cobra.Command, args []string) error {`
`@@ -119,7 +120,7 @@ func runClusterAdd(ctx context.Context, opts *ClusterAddOptions) error {`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`ingressUrl := *runtime.IngressHost`
`122`		`- server, err := util.KubeServerByContextName(opts.kubeContext)`
	`123`	`+ server, err := util.KubeServerByContextName(opts.kubeContext, opts.kubeconfig)`
`123`	`124`	`if err != nil {`
`124`	`125`	`return fmt.Errorf("failed getting server for context \"%s\": %w", opts.kubeContext, err)`
`125`	`126`	`}`
`@@ -201,20 +202,21 @@ func NewClusterListCommand() *cobra.Command {`
`201`	`202`	`return err`
`202`	`203`	`},`
`203`	`204`	`RunE: func(cmd *cobra.Command, _ []string) error {`
`204`		`- return runClusterList(cmd.Context(), runtimeName)`
	`205`	`+ kubeconfig := cmd.Flag("kubeconfig").Value.String()`
	`206`	`+ return runClusterList(cmd.Context(), runtimeName, kubeconfig)`
`205`	`207`	`},`
`206`	`208`	`}`
`207`	`209`
`208`	`210`	`return cmd`
`209`	`211`	`}`
`210`	`212`
`211`		`-func runClusterList(ctx context.Context, runtimeName string) error {`
	`213`	`+func runClusterList(ctx context.Context, runtimeName, kubeconfig string) error {`
`212`	`214`	`runtime, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)`
`213`	`215`	`if err != nil {`
`214`	`216`	`return err`
`215`	`217`	`}`
`216`	`218`
`217`		`- kubeContext, err := util.KubeContextNameByServer(*runtime.Cluster)`
	`219`	`+ kubeContext, err := util.KubeContextNameByServer(*runtime.Cluster, kubeconfig)`
`218`	`220`	`if err != nil {`
`219`	`221`	`return fmt.Errorf("failed getting context for \"%s\": %w", *runtime.Cluster, err)`
`220`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -362,23 +362,25 @@ func promptSummaryToUser(ctx context.Context, finalParameters map[string]string,`
`362`	`362`	`return false, nil`
`363`	`363`	`}`
`364`	`364`
`365`		`-func ensureKubeContextName(flag *pflag.Flag) (string, error) {`
`366`		`- contextName, err := getKubeContextName(flag)`
	`365`	`+func ensureKubeContextName(context, kubeconfig *pflag.Flag) (string, error) {`
	`366`	`+ contextName, err := getKubeContextName(context, kubeconfig)`
`367`	`367`	`if err != nil {`
`368`	`368`	`return "", err`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`if contextName == "" {`
`372`		`- return "", fmt.Errorf("must supply value for \"%s\"", flag.Name)`
	`372`	`+ return "", fmt.Errorf("must supply value for \"%s\"", context.Name)`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`return contextName, nil`
`376`	`376`	`}`
`377`	`377`
`378`		`-func getKubeContextName(flag *pflag.Flag) (string, error) {`
`379`		`- contextName := flag.Value.String()`
	`378`	`+func getKubeContextName(context, kubeconfig *pflag.Flag) (string, error) {`
	`379`	`+ kubeconfigPath := kubeconfig.Value.String()`
	`380`	`+`
	`381`	`+ contextName := context.Value.String()`
`380`	`382`	`if contextName != "" {`
`381`		`- if !util.CheckExistingContext(contextName) {`
	`383`	`+ if !util.CheckExistingContext(contextName, kubeconfigPath) {`
`382`	`384`	`return "", fmt.Errorf("kubeconfig file missing context \"%s\"", contextName)`
`383`	`385`	`}`
`384`	`386`
`@@ -387,22 +389,22 @@ func getKubeContextName(flag *pflag.Flag) (string, error) {`
`387`	`389`
`388`	`390`	`if !store.Get().Silent {`
`389`	`391`	`var err error`
`390`		`- contextName, err = getKubeContextNameFromUserSelect()`
	`392`	`+ contextName, err = getKubeContextNameFromUserSelect(kubeconfigPath)`
`391`	`393`	`if err != nil {`
`392`	`394`	`return "", err`
`393`	`395`	`}`
`394`	`396`	`}`
`395`	`397`
`396`		`- return contextName, flag.Value.Set(contextName)`
	`398`	`+ return contextName, context.Value.Set(contextName)`
`397`	`399`	`}`
`398`	`400`
`399`	`401`	`type SelectItem struct {`
`400`	`402`	`Value string`
`401`	`403`	`Label string`
`402`	`404`	`}`
`403`	`405`
`404`		`-func getKubeContextNameFromUserSelect() (string, error) {`
`405`		`- contexts := util.KubeContexts()`
	`406`	`+func getKubeContextNameFromUserSelect(kubeconfig string) (string, error) {`
	`407`	`+ contexts := util.KubeContexts(kubeconfig)`
`406`	`408`	`templates := &promptui.SelectTemplates{`
`407`	`409`	`Active: "▸ {{ .Name }} {{if .Current }}(current){{end}}",`
`408`	`410`	`Inactive: " {{ .Name }} {{if .Current }}(current){{end}}",`