Merge pull request kubernetes#5955 from adamyy/export_kubecfg_add_kub…

…econfig_option Add --kubeconfig flag to `kops export kubecfg`
betinro · Mar 15, 2019 · 09e5cad · 09e5cad
2 parents 04ccfb2 + 14862af
commit 09e5cad
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/cmd/kops/delete_cluster.go b/cmd/kops/delete_cluster.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kops/cmd/kops/util"
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/kubeconfig"
@@ -202,7 +203,7 @@ func RunDeleteCluster(f *util.Factory, out io.Writer, options *DeleteClusterOpti
 		}
 	}
 
-	b := kubeconfig.NewKubeconfigBuilder()
+	b := kubeconfig.NewKubeconfigBuilder(clientcmd.NewDefaultPathOptions())
 	b.Context = clusterName
 	err = b.DeleteKubeConfig()
 	if err != nil {

diff --git a/cmd/kops/export_kubecfg.go b/cmd/kops/export_kubecfg.go
@@ -20,6 +20,7 @@ import (
 	"io"
 
 	"github.com/spf13/cobra"
+	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kops/cmd/kops/util"
 	"k8s.io/kops/pkg/commands"
 	"k8s.io/kops/pkg/kubeconfig"
@@ -44,8 +45,9 @@ var (
 )
 
 type ExportKubecfgOptions struct {
-	tmpdir   string
-	keyStore fi.CAStore
+	tmpdir         string
+	keyStore       fi.CAStore
+	KubeConfigPath string
 }
 
 func NewCmdExportKubecfg(f *util.Factory, out io.Writer) *cobra.Command {
@@ -64,6 +66,8 @@ func NewCmdExportKubecfg(f *util.Factory, out io.Writer) *cobra.Command {
 		},
 	}
 
+	cmd.Flags().StringVar(&options.KubeConfigPath, "kubeconfig", options.KubeConfigPath, "The location of the kubeconfig file to create.")
+
 	return cmd
 }
 
@@ -93,10 +97,22 @@ func RunExportKubecfg(f *util.Factory, out io.Writer, options *ExportKubecfgOpti
 		return err
 	}
 
-	conf, err := kubeconfig.BuildKubecfg(cluster, keyStore, secretStore, &commands.CloudDiscoveryStatusStore{})
+	conf, err := kubeconfig.BuildKubecfg(cluster, keyStore, secretStore, &commands.CloudDiscoveryStatusStore{}, buildPathOptions(options))
 	if err != nil {
 		return err
 	}
 
 	return conf.WriteKubecfg()
 }
+
+func buildPathOptions(options *ExportKubecfgOptions) *clientcmd.PathOptions {
+	pathOptions := clientcmd.NewDefaultPathOptions()
+
+	if len(options.KubeConfigPath) > 0 {
+		pathOptions.GlobalFile = options.KubeConfigPath
+		pathOptions.EnvVar = ""
+		pathOptions.GlobalFileSubpath = ""
+	}
+
+	return pathOptions
+}
diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go
@@ -27,6 +27,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kops/cmd/kops/util"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/commands"
@@ -288,7 +289,7 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd
 		}
 		if kubecfgCert != nil {
 			glog.Infof("Exporting kubecfg for cluster")
-			conf, err := kubeconfig.BuildKubecfg(cluster, keyStore, secretStore, &commands.CloudDiscoveryStatusStore{})
+			conf, err := kubeconfig.BuildKubecfg(cluster, keyStore, secretStore, &commands.CloudDiscoveryStatusStore{}, clientcmd.NewDefaultPathOptions())
 			if err != nil {
 				return nil, err
 			}

diff --git a/docs/cli/kops_export_kubecfg.md b/docs/cli/kops_export_kubecfg.md
@@ -23,7 +23,8 @@ kops export kubecfg CLUSTERNAME [flags]
 ### Options
 
 ```
-  -h, --help   help for kubecfg
+  -h, --help                help for kubecfg
+      --kubeconfig string   The location of the kubeconfig file to create.
 ```
 
 ### Options inherited from parent commands

diff --git a/pkg/kubeconfig/create_kubecfg.go b/pkg/kubeconfig/create_kubecfg.go
@@ -21,12 +21,13 @@ import (
 	"sort"
 
 	"github.com/golang/glog"
+	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/dns"
 	"k8s.io/kops/upup/pkg/fi"
 )
 
-func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.SecretStore, status kops.StatusStore) (*KubeconfigBuilder, error) {
+func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.SecretStore, status kops.StatusStore, configAccess clientcmd.ConfigAccess) (*KubeconfigBuilder, error) {
 	clusterName := cluster.ObjectMeta.Name
 
 	master := cluster.Spec.MasterPublicName
@@ -81,7 +82,7 @@ func BuildKubecfg(cluster *kops.Cluster, keyStore fi.Keystore, secretStore fi.Se
 		}
 	}
 
-	b := NewKubeconfigBuilder()
+	b := NewKubeconfigBuilder(configAccess)
 
 	b.Context = clusterName
 

diff --git a/pkg/kubeconfig/kubecfg_builder.go b/pkg/kubeconfig/kubecfg_builder.go
@@ -45,9 +45,9 @@ type KubeconfigBuilder struct {
 }
 
 // Create new KubeconfigBuilder
-func NewKubeconfigBuilder() *KubeconfigBuilder {
+func NewKubeconfigBuilder(configAccess clientcmd.ConfigAccess) *KubeconfigBuilder {
 	c := &KubeconfigBuilder{}
-	c.configAccess = clientcmd.NewDefaultPathOptions()
+	c.configAccess = configAccess
 	return c
 }