File tree Expand file tree Collapse file tree 5 files changed +13
-24
lines changed Expand file tree Collapse file tree 5 files changed +13
-24
lines changed Original file line number Diff line number Diff line change 11package client
22
33import (
4- "time"
5-
6- klog "k8s.io/klog/v2"
4+ "k8s.io/klog/v2"
75
86 "github.com/ray-project/kuberay/apiserver/pkg/util"
97 "sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -24,7 +22,7 @@ func (cc RayClusterClient) RayClusterClient(namespace string) rayv1.RayClusterIn
2422 return cc .client .RayClusters (namespace )
2523}
2624
27- func NewRayClusterClientOrFatal (initConnectionTimeout time. Duration , options util.ClientOptions ) ClusterClientInterface {
25+ func NewRayClusterClientOrFatal (options util.ClientOptions ) ClusterClientInterface {
2826 cfg , err := config .GetConfig ()
2927 if err != nil {
3028 klog .Fatalf ("Failed to create RayCluster client. Error: %v" , err )
Original file line number Diff line number Diff line change 11package client
22
33import (
4- "time"
5-
6- klog "k8s.io/klog/v2"
4+ "k8s.io/klog/v2"
75
86 "github.com/ray-project/kuberay/apiserver/pkg/util"
97 "sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -24,7 +22,7 @@ func (cc RayJobClient) RayJobClient(namespace string) rayv1.RayJobInterface {
2422 return cc .client .RayJobs (namespace )
2523}
2624
27- func NewRayJobClientOrFatal (initConnectionTimeout time. Duration , options util.ClientOptions ) JobClientInterface {
25+ func NewRayJobClientOrFatal (options util.ClientOptions ) JobClientInterface {
2826 cfg , err := config .GetConfig ()
2927 if err != nil {
3028 klog .Fatalf ("Failed to create RayCluster client. Error: %v" , err )
Original file line number Diff line number Diff line change 11package client
22
33import (
4- "time"
5-
6- klog "k8s.io/klog/v2"
4+ "k8s.io/klog/v2"
75 "sigs.k8s.io/controller-runtime/pkg/client/config"
86
97 "github.com/ray-project/kuberay/apiserver/pkg/util"
@@ -39,7 +37,7 @@ func (c *KubernetesClient) NamespaceClient() v1.NamespaceInterface {
3937}
4038
4139// CreateKubernetesCoreOrFatal creates a new client for the Kubernetes pod.
42- func CreateKubernetesCoreOrFatal (initConnectionTimeout time. Duration , options util.ClientOptions ) KubernetesClientInterface {
40+ func CreateKubernetesCoreOrFatal (options util.ClientOptions ) KubernetesClientInterface {
4341 cfg , err := config .GetConfig ()
4442 if err != nil {
4543 klog .Fatalf ("Failed to create TokenReview client. Error: %v" , err )
Original file line number Diff line number Diff line change 11package client
22
33import (
4- "time"
5-
6- klog "k8s.io/klog/v2"
4+ "k8s.io/klog/v2"
75
86 "github.com/ray-project/kuberay/apiserver/pkg/util"
97 "sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -24,7 +22,7 @@ func (cc RayServiceClient) RayServiceClient(namespace string) rayv1.RayServiceIn
2422 return cc .client .RayServices (namespace )
2523}
2624
27- func NewRayServiceClientOrFatal (initConnectionTimeout time. Duration , options util.ClientOptions ) ServiceClientInterface {
25+ func NewRayServiceClientOrFatal (options util.ClientOptions ) ServiceClientInterface {
2826 cfg , err := config .GetConfig ()
2927 if err != nil {
3028 klog .Fatalf ("Failed to create RayService client. Error: %v" , err )
Original file line number Diff line number Diff line change 11package manager
22
33import (
4- "time"
5-
64 "github.com/ray-project/kuberay/apiserver/pkg/client"
75 "github.com/ray-project/kuberay/apiserver/pkg/util"
8- klog "k8s.io/klog/v2"
6+ "k8s.io/klog/v2"
97)
108
119type ClientManagerInterface interface {
@@ -52,7 +50,6 @@ func (c *ClientManager) init() {
5250 klog .Info ("Initializing client manager" )
5351
5452 // configure configs
55- initConnectionTimeout := 15 * time .Second
5653 defaultKubernetesClientConfig := util.ClientOptions {
5754 QPS : 5 ,
5855 Burst : 10 ,
@@ -63,10 +60,10 @@ func (c *ClientManager) init() {
6360
6461 // TODO: Potentially, we may need storage layer clients to help persist the data.
6562 // 2. kubernetes client initialization
66- c .clusterClient = client .NewRayClusterClientOrFatal (initConnectionTimeout , defaultKubernetesClientConfig )
67- c .jobClient = client .NewRayJobClientOrFatal (initConnectionTimeout , defaultKubernetesClientConfig )
68- c .serviceClient = client .NewRayServiceClientOrFatal (initConnectionTimeout , defaultKubernetesClientConfig )
69- c .kubernetesClient = client .CreateKubernetesCoreOrFatal (initConnectionTimeout , defaultKubernetesClientConfig )
63+ c .clusterClient = client .NewRayClusterClientOrFatal (defaultKubernetesClientConfig )
64+ c .jobClient = client .NewRayJobClientOrFatal (defaultKubernetesClientConfig )
65+ c .serviceClient = client .NewRayServiceClientOrFatal (defaultKubernetesClientConfig )
66+ c .kubernetesClient = client .CreateKubernetesCoreOrFatal (defaultKubernetesClientConfig )
7067
7168 klog .Infof ("Client manager initialized successfully" )
7269}
You can’t perform that action at this time.
0 commit comments