Merge pull request #9 from herbygillot/kubeconf-name-config

Allow for specifying kubeconfig-name in the config file
danielfoehrKn · Mar 4, 2021 · 1685a46 · 1685a46
2 parents a327f7e + 2f19d69
commit 1685a46
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/cmd/switcher/switcher.go b/cmd/switcher/switcher.go
@@ -35,7 +35,10 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const vaultTokenFileName = ".vault-token"
+const (
+	vaultTokenFileName    = ".vault-token"
+	defaultKubeconfigName = "config"
+)
 
 var (
 	// root command
@@ -278,7 +281,7 @@ func setCommonFlags(command *cobra.Command) {
 	command.Flags().StringVar(
 		&kubeconfigName,
 		"kubeconfig-name",
-		"config",
+		defaultKubeconfigName,
 		"only shows kubeconfig files with this name. Accepts wilcard arguments '*' and '?'. Defaults to 'config'.")
 	command.Flags().StringVar(
 		&vaultAPIAddressFromFlag,
@@ -314,6 +317,12 @@ func initialize() ([]store.KubeconfigStore, *types.Config, error) {
 		config = &types.Config{}
 	}
 
+	if kubeconfigName == defaultKubeconfigName {
+		if config.KubeconfigName != "" {
+			kubeconfigName = config.KubeconfigName
+		}
+	}
+
 	if len(kubeconfigPath) > 0 {
 		config.KubeconfigPaths = append(config.KubeconfigPaths, types.KubeconfigPath{
 			Path:  kubeconfigPath,

diff --git a/docs/kubeconfig_stores.md b/docs/kubeconfig_stores.md
@@ -119,6 +119,19 @@ kubeconfigPaths:
     store: filesystem
 ```
 
+## Specify the Kubeconfig name/pattern
+
+The name or pattern to use when searching for kubeconfig files within a store is specified via the command line flag `--kubeconfig-name`.  This can also be defined in config:
+
+```
+$ cat ~/.kube/switch-config.yaml
+kind: SwitchConfig
+kubeconfigName: "*.myconfig"
+kubeconfigPaths:
+  - path: "~/.kube/local-kubeconfigs/"
+    store: filesystem
+```
+
 ## Using both CLI and `SwitchConfig` file
 
 - The flag `--vault-api-address` takes presendence over the config field `vaultAPIAddress`.

diff --git a/types/config.go b/types/config.go
@@ -25,6 +25,7 @@ const (
 
 type Config struct {
 	Kind                          string           `yaml:"kind"`
+	KubeconfigName                string           `yaml:"kubeconfigName"`
 	KubeconfigRediscoveryInterval *time.Duration   `yaml:"kubeconfigRediscoveryInterval"`
 	VaultAPIAddress               string           `yaml:"vaultAPIAddress"`
 	Hooks                         []Hook           `yaml:"hooks"`