✨ (kubernetes): Add support for colon-separated paths in KUBECONFIG

clevyr · Feb 28, 2023 · a1d91d3 · a1d91d3
1 parent 6167220
commit a1d91d3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/internal/config/flags/kubernetes.go b/internal/config/flags/kubernetes.go
@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/clientcmd"
 	"os"
 	"path/filepath"
 )
@@ -33,7 +34,11 @@ func Context(cmd *cobra.Command) {
 			if err != nil {
 				panic(err)
 			}
-			conf, err := kubernetes.RawConfig(kubeconfig)
+			configLoader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
+				&clientcmd.ClientConfigLoadingRules{Precedence: filepath.SplitList(kubeconfig)},
+				nil,
+			)
+			conf, err := configLoader.RawConfig()
 			if err != nil {
 				return nil, cobra.ShellCompDirectiveNoFileComp
 			}

diff --git a/internal/kubernetes/client.go b/internal/kubernetes/client.go
@@ -6,7 +6,7 @@ import (
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/tools/clientcmd/api"
+	"path/filepath"
 )
 
 type KubeClient struct {
@@ -27,20 +27,20 @@ func (client KubeClient) Secrets() v1.SecretInterface {
 	return client.ClientSet.CoreV1().Secrets(client.Namespace)
 }
 
-func NewConfigLoader(kubeconfigPath, context string) clientcmd.ClientConfig {
+func NewConfigLoader(kubeconfig, context string) clientcmd.ClientConfig {
 	var overrides *clientcmd.ConfigOverrides
 	if context != "" {
 		overrides = &clientcmd.ConfigOverrides{CurrentContext: context}
 	}
 
 	return clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
-		&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfigPath},
+		&clientcmd.ClientConfigLoadingRules{Precedence: filepath.SplitList(kubeconfig)},
 		overrides,
 	)
 }
 
-func NewClient(kubeconfigPath, context, namespace string) (config KubeClient, err error) {
-	configLoader := NewConfigLoader(kubeconfigPath, context)
+func NewClient(kubeconfig, context, namespace string) (config KubeClient, err error) {
+	configLoader := NewConfigLoader(kubeconfig, context)
 
 	config.ClientConfig, err = configLoader.ClientConfig()
 	if err != nil {
@@ -82,10 +82,3 @@ func NewClientFromCmd(cmd *cobra.Command) (KubeClient, error) {
 
 	return NewClient(kubeconfig, context, namespace)
 }
-
-func RawConfig(kubeconfigPath string) (api.Config, error) {
-	configLoader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
-		&clientcmd.ClientConfigLoadingRules{ExplicitPath: kubeconfigPath}, nil,
-	)
-	return configLoader.RawConfig()
-}