mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00
Code Activity

Merge pull request #1562 from marquiz/devel/apihelper-refactor-1

Browse source 
pkg/utils: move GetKubeconfig from pkg/apihelper here
This commit is contained in:
Kubernetes Prow Robot 2024-01-25 10:24:39 +01:00 committed by GitHub
commit 3ef10fecd0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/apihelper/k8shelpers.go
View file

@ -26,7 +26,6 @@ import (
"k8s.io/apimachinery/pkg/types"
k8sclient "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
)
// K8sHelpers implements APIHelpers
@ -110,11 +109,3 @@ func (h K8sHelpers) GetPod(cli *k8sclient.Clientset, namespace string, podName s
return pod, nil
}
// GetKubeconfig returns the kubeconfig for the cluster
func GetKubeconfig(path string) (*restclient.Config, error) {
if path == "" {
return restclient.InClusterConfig()
}
return clientcmd.BuildConfigFromFlags("", path)
}

3
pkg/nfd-gc/nfd-gc.go
View file

@ -31,7 +31,6 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/klog/v2"
"sigs.k8s.io/node-feature-discovery/pkg/apihelper"
nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1"
nfdclientset "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
"sigs.k8s.io/node-feature-discovery/pkg/utils"
@ -59,7 +58,7 @@ type nfdGarbageCollector struct {
}
func New(args *Args) (NfdGarbageCollector, error) {
kubeconfig, err := apihelper.GetKubeconfig(args.Kubeconfig)
kubeconfig, err := utils.GetKubeconfig(args.Kubeconfig)
if err != nil {
return nil, err
}

2
pkg/nfd-master/nfd-master.go
View file

@ -1140,7 +1140,7 @@ func (m *nfdMaster) updateNodeObject(cli *kubernetes.Clientset, nodeName string,
func (m *nfdMaster) getKubeconfig() (*restclient.Config, error) {
var err error
if m.kubeconfig == nil {
m.kubeconfig, err = apihelper.GetKubeconfig(m.args.Kubeconfig)
m.kubeconfig, err = utils.GetKubeconfig(m.args.Kubeconfig)
}
return m.kubeconfig, err
}

2
pkg/nfd-topology-updater/nfd-topology-updater.go
View file

@ -131,7 +131,7 @@ func (w *nfdTopologyUpdater) Run() error {
return fmt.Errorf("failed to get PodResource Client: %w", err)
}
kubeconfig, err := apihelper.GetKubeconfig(w.args.KubeConfigFile)
kubeconfig, err := utils.GetKubeconfig(w.args.KubeConfigFile)
if err != nil {
return err
}

3
pkg/nfd-worker/nfd-worker.go
View file

@ -42,7 +42,6 @@ import (
apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/node-feature-discovery/pkg/apihelper"
nfdv1alpha1 "sigs.k8s.io/node-feature-discovery/pkg/apis/nfd/v1alpha1"
nfdclient "sigs.k8s.io/node-feature-discovery/pkg/generated/clientset/versioned"
pb "sigs.k8s.io/node-feature-discovery/pkg/labeler"
@ -747,7 +746,7 @@ func (m *nfdWorker) getNfdClient() (*nfdclient.Clientset, error) {
return m.nfdClient, nil
}
kubeconfig, err := apihelper.GetKubeconfig(m.args.Kubeconfig)
kubeconfig, err := utils.GetKubeconfig(m.args.Kubeconfig)
if err != nil {
return nil, err
}

11
pkg/utils/kubernetes.go
View file

@ -19,6 +19,9 @@ package utils
import (
"os"
"strings"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
)
var nodeName string
@ -43,3 +46,11 @@ func GetKubernetesNamespace() string {
}
return os.Getenv("KUBERNETES_NAMESPACE")
}
// GetKubeconfig returns the kubeconfig for the cluster
func GetKubeconfig(path string) (*restclient.Config, error) {
if path == "" {
return restclient.InClusterConfig()
}
return clientcmd.BuildConfigFromFlags("", path)
}