Revert "fix: use kubeconfig file when user specify it (#605)" (#608)

This reverts commit e3b21ec5ec.
This commit is contained in:
Alex Jones
2023-08-19 20:58:34 +01:00
committed by GitHub
parent cc665ea4f3
commit 13f63eda2a

View File

@@ -36,11 +36,14 @@ func (c *Client) GetRestClient() rest.Interface {
func NewClient(kubecontext string, kubeconfig string) (*Client, error) { func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
var config *rest.Config var config *rest.Config
var err error config, err := rest.InClusterConfig()
if err != nil {
if kubeconfig != "" {
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules() loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
loadingRules.ExplicitPath = kubeconfig
if kubeconfig != "" {
loadingRules.ExplicitPath = kubeconfig
}
clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig( clientConfig := clientcmd.NewNonInteractiveDeferredLoadingClientConfig(
loadingRules, loadingRules,
&clientcmd.ConfigOverrides{ &clientcmd.ConfigOverrides{
@@ -51,13 +54,7 @@ func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
} else {
config, err = rest.InClusterConfig()
if err != nil {
return nil, err
}
} }
clientSet, err := kubernetes.NewForConfig(config) clientSet, err := kubernetes.NewForConfig(config)
if err != nil { if err != nil {
return nil, err return nil, err