Skip to content

Commit

Permalink
Fix pkg/kube to use standard kubeconfig machinery (#2132)
Browse files Browse the repository at this point in the history
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
  • Loading branch information
miquella and mergify[bot] authored Jun 23, 2023
1 parent fa7beb3 commit 855ce17
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions pkg/kube/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
package kube

import (
"os"

"github.com/pkg/errors"
crdclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
"k8s.io/client-go/dynamic"
Expand Down Expand Up @@ -45,19 +43,6 @@ func ConfigNamespace() (string, error) {

// LoadConfig returns a kubernetes client config based on global settings.
func LoadConfig() (*rest.Config, error) {
kubeConfigEnv := os.Getenv(clientcmd.RecommendedConfigPathEnvVar)
if len(kubeConfigEnv) != 0 {
return clientcmd.BuildConfigFromFlags("", kubeConfigEnv)
}

if c, err := clientcmd.BuildConfigFromFlags("", clientcmd.RecommendedHomeFile); err == nil {
return c, nil
}

if c, err := rest.InClusterConfig(); err == nil {
return c, nil
}

return newClientConfig().ClientConfig()
}

Expand Down

0 comments on commit 855ce17

Please sign in to comment.