fix: Remove the pkg/k8sutil/client.go and replace it with HAMi/pkg/ut…

…il/client in pkg/scheduler/scheduler.go Signed-off-by: Shouren Yang <[email protected]>
Project-HAMi · Dec 5, 2024 · ae54f90 · ae54f90
1 parent 24fd039
commit ae54f90
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 51 deletions.
diff --git a/pkg/k8sutil/client.go b/pkg/k8sutil/client.go
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -29,6 +29,7 @@ import (
 	"github.com/Project-HAMi/HAMi/pkg/scheduler/config"
 	"github.com/Project-HAMi/HAMi/pkg/scheduler/policy"
 	"github.com/Project-HAMi/HAMi/pkg/util"
+	"github.com/Project-HAMi/HAMi/pkg/util/client"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -125,7 +126,7 @@ func (s *Scheduler) onDelPod(obj interface{}) {
 }
 
 func (s *Scheduler) Start() {
-	kubeClient, err := k8sutil.NewClient()
+	kubeClient, err := client.NewClient()
 	check(err)
 	s.kubeClient = kubeClient
 	informerFactory := informers.NewSharedInformerFactoryWithOptions(s.kubeClient, time.Hour*1)

diff --git a/pkg/util/client/client.go b/pkg/util/client/client.go
@@ -30,15 +30,14 @@ var (
 	KubeClient kubernetes.Interface
 )
 
-func init() {
+func GetClient() kubernetes.Interface {
 	var err error
-	KubeClient, err = NewClient()
-	if err != nil {
-		panic(err)
+	if KubeClient == nil {
+		KubeClient, err = NewClient()
+		if err != nil {
+			panic(err)
+		}
 	}
-}
-
-func GetClient() kubernetes.Interface {
 	return KubeClient
 }