mirror of
https://github.com/k8sgpt-ai/k8sgpt.git
synced 2025-09-03 00:08:08 +00:00
This reverts commit e3b21ec5ec
.
This commit is contained in:
@@ -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
|
||||||
|
Reference in New Issue
Block a user