Replace Paths with KubeconfiFiles and Dirs

Signed-off-by: Nelo-T. Wallus <[email protected]>

Author: ntnn

examples/file/main.go

@@ -29,9 +29,10 @@ import (
 )
 
 var (
-	fPaths    = flag.String("paths", "", "Comma-separated list of file paths to process (can be files or directories), defaults to current directory")
-	fGlobs    = flag.String("globs", "", "Comma-separated list of glob patterns to match files")
-	fContinue = flag.Bool("continue", false, "Continue processing and listing files until cancelled")
+	fKubeconfigFiles = flag.String("kubeconfigs", "", "Comma-separated list of kubeconfig file paths to process")
+	fKubeconfigDirs  = flag.String("kubeconfig-dirs", "", "Comma-separated list of directories to search for kubeconfig files")
+	fGlobs           = flag.String("globs", "", "Comma-separated list of glob patterns to match files")
+	fContinue        = flag.Bool("continue", false, "Continue processing and listing files until cancelled")
 )
 
 func printClusters(clusters []string) {
@@ -51,8 +52,19 @@ func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
 
+	kubeconfigFiles := strings.Split(*fKubeconfigFiles, ",")
+	if len(kubeconfigFiles) == 1 && kubeconfigFiles[0] == "" {
+		kubeconfigFiles = []string{}
+	}
+
+	kubeconfigDirs := strings.Split(*fKubeconfigDirs, ",")
+	if len(kubeconfigDirs) == 1 && kubeconfigDirs[0] == "" {
+		kubeconfigDirs = []string{}
+	}
+
 	provider, err := file.New(file.Options{
-		Paths:           strings.Split(*fPaths, ","),
+		KubeconfigFiles: kubeconfigFiles,
+		KubeconfigDirs:  kubeconfigDirs,
 		KubeconfigGlobs: strings.Split(*fGlobs, ","),
 	})
 	if err != nil {

providers/file/clusters.go

@@ -30,7 +30,7 @@ import (
 type clusters map[string]cluster.Cluster
 
 func (p *Provider) loadClusters() (clusters, error) {
-	filepaths, err := p.collectPaths(p.opts.Paths)
+	filepaths, err := p.collectPaths()
 	if err != nil {
 		return nil, err
 	}
@@ -54,29 +54,30 @@ func (p *Provider) loadClusters() (clusters, error) {
 	return p.fromContexts(kubeCtxs), nil
 }
 
-func (p *Provider) collectPaths(paths []string) ([]string, error) {
-	filepaths := make([]string, 0, len(paths))
+func (p *Provider) collectPaths() ([]string, error) {
+	filepaths := []string{}
 
-	for _, path := range paths {
-		if path == "" {
-			continue
-		}
-
-		stat, err := os.Stat(path)
-		if err != nil {
+	for _, file := range p.opts.KubeconfigFiles {
+		if _, err := os.Stat(file); err != nil {
 			if os.IsNotExist(err) {
-				p.log.Info("path does not exist, skipping", "path", path)
+				p.log.Info("kubeconfig file does not exist, skipping", "file", file)
 				continue
 			}
-			return nil, fmt.Errorf("failed to stat path %q: %w", path, err)
+			return nil, fmt.Errorf("failed to stat kubeconfig file %q: %w", file, err)
 		}
+		filepaths = append(filepaths, file)
+	}
 
-		if !stat.IsDir() {
-			filepaths = append(filepaths, path)
-			continue
+	for _, dir := range p.opts.KubeconfigDirs {
+		if _, err := os.Stat(dir); err != nil {
+			if os.IsNotExist(err) {
+				p.log.Info("directory does not exist, skipping", "dir", dir)
+				continue
+			}
+			return nil, fmt.Errorf("failed to stat directory %q: %w", dir, err)
 		}
 
-		filepaths = append(filepaths, p.matchKubeconfigGlobs(path)...)
+		filepaths = append(filepaths, p.matchKubeconfigGlobs(dir)...)
 	}
 
 	return filepaths, nil

providers/file/provider.go

@@ -46,16 +46,22 @@ type Options struct {
 	// Default is one second.
 	UpdateInterval time.Duration
 
-	// Paths can be either paths to kubeconfig files or directories.
-	// If a directory is specified, the provider will look for files
-	// matching the KubeconfigGlobs.
-	// The provider will collect all kubeconfig files from all paths.
-	// The default is:
-	// - KUBECONFIG if it is set
-	// - ~/.kube/config if it exists
-	// - the current directory otherwise.
-	// Default is the current directory.
-	Paths []string
+	// KubeconfigFiles are paths to kubeconfig files.
+	// The default depends on the KubeconfigDirs variable.
+	KubeconfigFiles []string
+
+	// KubeconfigDirs are directories to search for kubeconfig files matching the
+	// globs specified in KubeconfigGlobs.
+	//
+	// If either one or both of KubeconfigFiles or KubeconfigDirs are
+	// set both are used as input for the provider.
+	// If both are empty defaults are in this order:
+	// 1. If the KUBECONFIG environment variable is set it is set in
+	//       KubeconfigFiles.
+	// 2. If ~/.kube/config exists it is set in KubeconfigFiles.
+	// 3. The working directory of the provider process is set in
+	//       KubeconfigDirs.
+	KubeconfigDirs []string
 
 	// KubeconfigGlobs are the glob patterns to match kubeconfig files
 	// in directories.
@@ -73,16 +79,23 @@ var DefaultKubeconfigGlobs = []string{
 	"*.kubeconfig.yml",
 }
 
-func defaultKubeconfigPaths() []string {
+func (p *Provider) defaultKubeconfigPaths() ([]string, []string) {
 	if envKubeconfig := os.Getenv("KUBECONFIG"); envKubeconfig != "" {
-		return []string{envKubeconfig}
+		return []string{envKubeconfig}, []string{}
 	}
 
-	if fstat, err := os.Stat(os.ExpandEnv("$HOME/.kube/config")); err == nil && !fstat.IsDir() {
-		return []string{os.ExpandEnv("$HOME/.kube/config")}
+	defaultKubeconfig := os.ExpandEnv("$HOME/.kube/config")
+	if _, err := os.Stat(defaultKubeconfig); err == nil {
+		return []string{defaultKubeconfig}, []string{}
 	}
 
-	return []string{"."}
+	pwd, err := os.Getwd()
+	if err != nil {
+		p.log.Error(err, "error getting working directory, defaulting to '.'")
+		pwd = "."
+	}
+
+	return []string{}, []string{pwd}
 }
 
 // New returns a new Provider with the given options.
@@ -94,8 +107,8 @@ func New(opts Options) (*Provider, error) {
 		p.opts.UpdateInterval = 1 * time.Second
 	}
 
-	if len(p.opts.Paths) == 0 {
-		p.opts.Paths = defaultKubeconfigPaths()
+	if len(p.opts.KubeconfigFiles) == 0 && len(p.opts.KubeconfigDirs) == 0 {
+		p.opts.KubeconfigFiles, p.opts.KubeconfigDirs = p.defaultKubeconfigPaths()
 	}
 
 	if len(p.opts.KubeconfigGlobs) == 0 {
@@ -106,6 +119,8 @@ func New(opts Options) (*Provider, error) {
 	p.clusters = make(map[string]cluster.Cluster)
 	p.clusterCancel = make(map[string]func())
 
+	fmt.Printf("file cluster provider initialized %q %q\n", p.opts.KubeconfigFiles, p.opts.KubeconfigDirs)
+
 	return p, nil
 }
 

providers/file/provider_test.go

@@ -50,7 +50,8 @@ var _ = Describe("Provider File", Ordered, func() {
 		By("Creating a new provider", func() {
 			var err error
 			provider, err = New(Options{
-				Paths: []string{discoverDir, kubeconfigPath},
+				KubeconfigFiles: []string{kubeconfigPath},
+				KubeconfigDirs:  []string{discoverDir},
 			})
 			Expect(err).NotTo(HaveOccurred())
 		})