Kubesec improvements and small refactoring

Author: togashidm

extender/client.go

@@ -2,7 +2,8 @@ package extender
 
 import (
 	"fmt"
-	"log"
+
+	"k8s.io/klog/v2"
 
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -13,7 +14,7 @@ import (
 func GetKubeClient(kubeConfig string) (kubernetes.Interface, *rest.Config, error) {
 	clientConfig, err := rest.InClusterConfig()
 	if err != nil {
-		log.Print("not in cluster - trying file-based configuration")
+		klog.V(l2).InfoS("not in cluster - trying file-based configuration", "component", "controller")
 
 		clientConfig, err = clientcmd.BuildConfigFromFlags("", kubeConfig)
 		if err != nil {
@@ -23,7 +24,7 @@ func GetKubeClient(kubeConfig string) (kubernetes.Interface, *rest.Config, error
 
 	kubeClient, err := kubernetes.NewForConfig(clientConfig)
 	if err != nil {
-		return nil, nil, fmt.Errorf("failed to get kubeclient: %w", err)
+		return nil, nil, fmt.Errorf("failed to create kubeClientset %w", err)
 	}
 
 	return kubeClient, clientConfig, nil

telemetry-aware-scheduling/cmd/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"os"
 
 	"os/signal"
@@ -20,20 +19,14 @@ import (
 	"github.com/intel/platform-aware-scheduling/telemetry-aware-scheduling/pkg/strategies/scheduleonmetric"
 	telemetrypolicyclient "github.com/intel/platform-aware-scheduling/telemetry-aware-scheduling/pkg/telemetrypolicy/client/v1alpha1"
 	"github.com/intel/platform-aware-scheduling/telemetry-aware-scheduling/pkg/telemetryscheduler"
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 
 	"context"
 
 	tascache "github.com/intel/platform-aware-scheduling/telemetry-aware-scheduling/pkg/cache"
 )
 
-const (
-	l2 = 2
-	l4 = 4
-)
+const l2 = 2
 
 func main() {
 	var kubeConfig, port, certFile, keyFile, caFile, syncPeriod string
@@ -66,7 +59,7 @@ func tasController(kubeConfig string, syncPeriod string, cache *tascache.AutoUpd
 		}
 	}()
 
-	kubeClient, clientConfig, err := getkubeClient(kubeConfig)
+	kubeClient, clientConfig, err := extender.GetKubeClient(kubeConfig)
 	if err != nil {
 		klog.V(l2).InfoS("Issue in getting client config", "component", "controller")
 		klog.Exit(err.Error())
@@ -115,26 +108,6 @@ func tasController(kubeConfig string, syncPeriod string, cache *tascache.AutoUpd
 	catchInterrupt(done)
 }
 
-func getkubeClient(kubeConfig string) (kubernetes.Interface, *rest.Config, error) {
-	clientConfig, err := rest.InClusterConfig()
-
-	if err != nil {
-		klog.V(l4).InfoS("not in cluster - trying file-based configuration", "component", "controller")
-
-		clientConfig, err = clientcmd.BuildConfigFromFlags("", kubeConfig)
-		if err != nil {
-			return nil, nil, fmt.Errorf("failed to get clientConfig %w", err)
-		}
-	}
-
-	kubeClient, err := kubernetes.NewForConfig(clientConfig)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to create kubeClientset %w", err)
-	}
-
-	return kubeClient, clientConfig, nil
-}
-
 func catchInterrupt(done chan os.Signal) {
 	signal.Notify(done, syscall.SIGINT, syscall.SIGTERM)
 	<-done

telemetry-aware-scheduling/deploy/tas-rbac-accounts.yaml

@@ -1,4 +1,18 @@
 apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: handle-policies
+subjects:
+  - kind: ServiceAccount
+    name: telemetry-aware-scheduling-service-account
+    namespace: default
+roleRef:
+  kind: ClusterRole
+  name: policy-handler
+  apiGroup: rbac.authorization.k8s.io
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: policy-handler
@@ -16,20 +30,6 @@ rules:
   resources: ["nodes"]
   verbs: ["get", "list", "patch"]
 
----
-  apiVersion: rbac.authorization.k8s.io/v1
-  kind: ClusterRoleBinding
-  metadata:
-    name: handle-policies
-  subjects:
-    - kind: ServiceAccount
-      name: telemetry-aware-scheduling-service-account
-      namespace: default
-  roleRef:
-    kind: ClusterRole
-    name: policy-handler
-    apiGroup: rbac.authorization.k8s.io
-
 ---
 apiVersion: v1
 kind: ServiceAccount