Simplify k8s client creation (ray-project#179)

Co-authored-by: wuhua.ck <[email protected]>
lowang-bh · Mar 22, 2022 · c1fcbd9 · c1fcbd9
1 parent 3b7244d
commit c1fcbd9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 116 deletions.
diff --git a/apiserver/pkg/client/cluster.go b/apiserver/pkg/client/cluster.go
@@ -1,20 +1,13 @@
 package client
 
 import (
-	"path/filepath"
 	"time"
 
-	"github.com/pkg/errors"
-	"github.com/ray-project/kuberay/apiserver/pkg/util"
-	"k8s.io/client-go/rest"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/util/homedir"
-
-	"github.com/cenkalti/backoff"
 	"github.com/golang/glog"
+	"github.com/ray-project/kuberay/apiserver/pkg/util"
 	rayclusterclient "github.com/ray-project/kuberay/ray-operator/pkg/client/clientset/versioned"
 	rayiov1alpha1 "github.com/ray-project/kuberay/ray-operator/pkg/client/clientset/versioned/typed/raycluster/v1alpha1"
-	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 type ClusterClientInterface interface {
@@ -30,51 +23,13 @@ func (cc RayClusterClient) RayClusterClient(namespace string) rayiov1alpha1.RayC
 }
 
 func NewRayClusterClientOrFatal(initConnectionTimeout time.Duration, options util.ClientOptions) ClusterClientInterface {
-	var rayClusterClient rayiov1alpha1.RayV1alpha1Interface
-	var err error
-	var operation = func() error {
-		// in cluster
-		restConfig, err := rest.InClusterConfig()
-		if err != nil {
-			return errors.Wrap(err, "Failed to initialize RestConfig.")
-		}
-		restConfig.QPS = options.QPS
-		restConfig.Burst = options.Burst
-
-		rayClusterClient = rayclusterclient.NewForConfigOrDie(restConfig).RayV1alpha1()
-		return nil
-	}
-
-	// out of cluster
-	rayClusterClient, err = newOutOfClusterRayClusterClient()
-	if err == nil {
-		return &RayClusterClient{client: rayClusterClient}
-	}
-	klog.Infof("(Expected when in cluster) Failed to create RayCluster client by out of cluster kubeconfig. Error: %v", err)
-
-	klog.Infof("Starting to create RayCluster client by in cluster config.")
-	b := backoff.NewExponentialBackOff()
-	b.MaxElapsedTime = initConnectionTimeout
-	err = backoff.Retry(operation, b)
-
+	cfg, err := config.GetConfig()
 	if err != nil {
-		glog.Fatalf("Failed to create TokenReview client. Error: %v", err)
-	}
-	return &RayClusterClient{client: rayClusterClient}
-}
-
-func newOutOfClusterRayClusterClient() (rayiov1alpha1.RayV1alpha1Interface, error) {
-	home := homedir.HomeDir()
-	if home == "" {
-		return nil, errors.New("Cannot get home dir")
+		glog.Fatalf("Failed to create RayCluster client. Error: %v", err)
 	}
+	cfg.QPS = options.QPS
+	cfg.Burst = options.Burst
 
-	defaultKubeConfigPath := filepath.Join(home, ".kube", "config")
-	// use the current context in kubeconfig
-	config, err := clientcmd.BuildConfigFromFlags("", defaultKubeConfigPath)
-	if err != nil {
-		return nil, err
-	}
-	rayClusterClient := rayclusterclient.NewForConfigOrDie(config).RayV1alpha1()
-	return rayClusterClient, nil
+	rayClusterClient := rayclusterclient.NewForConfigOrDie(cfg).RayV1alpha1()
+	return &RayClusterClient{client: rayClusterClient}
 }
diff --git a/apiserver/pkg/client/kubernetes.go b/apiserver/pkg/client/kubernetes.go
@@ -1,19 +1,15 @@
 package client
 
 import (
-	"path/filepath"
 	"time"
 
-	"k8s.io/client-go/rest"
+	"github.com/golang/glog"
 	"k8s.io/klog/v2"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
-	"github.com/cenkalti/backoff"
-	"github.com/pkg/errors"
 	"github.com/ray-project/kuberay/apiserver/pkg/util"
 	"k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/util/homedir"
 )
 
 type KubernetesClientInterface interface {
@@ -35,66 +31,16 @@ func (c *KubernetesClient) ConfigMapClient(namespace string) v1.ConfigMapInterfa
 
 // CreateKubernetesCoreOrFatal creates a new client for the Kubernetes pod.
 func CreateKubernetesCoreOrFatal(initConnectionTimeout time.Duration, options util.ClientOptions) KubernetesClientInterface {
-	var client KubernetesClientInterface
-	var err error
-	var operation = func() error {
-		// In cluster
-		kubernetesClient, err := newInClusterKubernetesClient(options)
-		if err != nil {
-			return err
-		}
-		client = kubernetesClient
-		return nil
-	}
-
-	// Out of cluster
-	kubernetesClient, err := newOutOfClusterKubernetesClient()
-	if err == nil {
-		return kubernetesClient
-	}
-	klog.Infof("(Expected when in cluster) Failed to create Kubernetes client by out of cluster kubeconfig. Error: %v", err)
-
-	klog.Infof("Starting to create Kubernetes client by in cluster config.")
-	b := backoff.NewExponentialBackOff()
-	b.MaxElapsedTime = initConnectionTimeout
-	if err := backoff.Retry(operation, b); err != nil {
-		klog.Fatalf("Failed to create pod client. Error: %v", err)
-	}
-
-	return client
-}
-
-func newInClusterKubernetesClient(options util.ClientOptions) (*KubernetesClient, error) {
-	restConfig, err := rest.InClusterConfig()
+	cfg, err := config.GetConfig()
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to initialize kubernetes client.")
+		glog.Fatalf("Failed to create TokenReview client. Error: %v", err)
 	}
-	restConfig.QPS = options.QPS
-	restConfig.Burst = options.Burst
+	cfg.QPS = options.QPS
+	cfg.Burst = options.Burst
 
-	clientSet, err := kubernetes.NewForConfig(restConfig)
+	clientSet, err := kubernetes.NewForConfig(cfg)
 	if err != nil {
-		return nil, errors.Wrap(err, "Failed to initialize kubernetes client set.")
-	}
-	return &KubernetesClient{clientSet.CoreV1()}, nil
-}
-
-func newOutOfClusterKubernetesClient() (*KubernetesClient, error) {
-	home := homedir.HomeDir()
-	if home == "" {
-		return nil, errors.New("Cannot get home dir")
-	}
-
-	defaultKubeConfigPath := filepath.Join(home, ".kube", "config")
-	// use the current context in kubeconfig
-	config, err := clientcmd.BuildConfigFromFlags("", defaultKubeConfigPath)
-	if err != nil {
-		return nil, err
-	}
-
-	clientSet, err := kubernetes.NewForConfig(config)
-	if err != nil {
-		return nil, errors.Wrap(err, "Failed to initialize kubernetes clientSet set.")
+		klog.Fatalf("Failed to create pod client. Error: %v", err)
 	}
-	return &KubernetesClient{clientSet.CoreV1()}, nil
+	return &KubernetesClient{clientSet.CoreV1()}
 }