Skip to content

Commit 8944703

Browse files
dentinydentiny
authored
[2/N] [apiserver] Fix second-half apiserver lint (#3338)
1 parent 22f57e9 commit 8944703

File tree

12 files changed

+140
-126
lines changed

12 files changed

+140
-126
lines changed

‎apiserver/cmd/main.go

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ func startHttpProxy() {
129129
runtime.WithErrorHandler(runtime.DefaultHTTPErrorHandler),
130130
)
131131
// Register endpoints
132-
registerHttpHandlerFromEndpoint(api.RegisterClusterServiceHandlerFromEndpoint, "ClusterService", ctx, runtimeMux)
133-
registerHttpHandlerFromEndpoint(api.RegisterComputeTemplateServiceHandlerFromEndpoint, "ComputeTemplateService", ctx, runtimeMux)
134-
registerHttpHandlerFromEndpoint(api.RegisterRayJobServiceHandlerFromEndpoint, "JobService", ctx, runtimeMux)
135-
registerHttpHandlerFromEndpoint(api.RegisterRayServeServiceHandlerFromEndpoint, "ServeService", ctx, runtimeMux)
136-
registerHttpHandlerFromEndpoint(api.RegisterRayJobSubmissionServiceHandlerFromEndpoint, "RayJobSubmissionService", ctx, runtimeMux)
132+
registerHttpHandlerFromEndpoint(ctx, api.RegisterClusterServiceHandlerFromEndpoint, "ClusterService", runtimeMux)
133+
registerHttpHandlerFromEndpoint(ctx, api.RegisterComputeTemplateServiceHandlerFromEndpoint, "ComputeTemplateService", runtimeMux)
134+
registerHttpHandlerFromEndpoint(ctx, api.RegisterRayJobServiceHandlerFromEndpoint, "JobService", runtimeMux)
135+
registerHttpHandlerFromEndpoint(ctx, api.RegisterRayServeServiceHandlerFromEndpoint, "ServeService", runtimeMux)
136+
registerHttpHandlerFromEndpoint(ctx, api.RegisterRayJobSubmissionServiceHandlerFromEndpoint, "RayJobSubmissionService", runtimeMux)
137137

138138
// Create a top level mux to include both Http gRPC servers and other endpoints like metrics
139139
topMux := http.NewServeMux()
@@ -144,7 +144,17 @@ func startHttpProxy() {
144144
topMux.HandleFunc("/healthz", serveHealth)
145145
serveSwaggerUI(topMux)
146146

147-
if err := http.ListenAndServe(*httpPortFlag, topMux); err != nil {
147+
// Create a custom HTTP server with timeouts.
148+
srv := &http.Server{
149+
Addr: *httpPortFlag,
150+
Handler: topMux,
151+
ReadTimeout: 0, // No timeout
152+
WriteTimeout: 0, // No timeout
153+
IdleTimeout: 0, // No timeout
154+
}
155+
156+
// Start the server.
157+
if err := srv.ListenAndServe(); err != nil {
148158
klog.Fatal(err)
149159
}
150160

@@ -194,7 +204,7 @@ func serveSwaggerUI(mux *http.ServeMux) {
194204
mux.Handle(prefix, http.StripPrefix(prefix, fileServer))
195205
}
196206

197-
func registerHttpHandlerFromEndpoint(handler RegisterHttpHandlerFromEndpoint, serviceName string, ctx context.Context, mux *runtime.ServeMux) {
207+
func registerHttpHandlerFromEndpoint(ctx context.Context, handler RegisterHttpHandlerFromEndpoint, serviceName string, mux *runtime.ServeMux) {
198208
endpoint := "localhost" + *rpcPortFlag
199209
opts := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(math.MaxInt32))}
200210

‎apiserver/pkg/http/client.go

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package http
22

33
import (
44
"bytes"
5+
"context"
56
"errors"
67
"fmt"
78
"io"
@@ -70,7 +71,7 @@ func (krc *KuberayAPIServerClient) CreateComputeTemplate(request *api.CreateComp
7071
return nil, nil, fmt.Errorf("failed to marshal api.ComputeTemplate to JSON: %w", err)
7172
}
7273

73-
httpRequest, err := http.NewRequest("POST", createURL, bytes.NewReader(bytez))
74+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "POST", createURL, bytes.NewReader(bytez))
7475
if err != nil {
7576
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", createURL, err)
7677
}
@@ -99,7 +100,7 @@ func (krc *KuberayAPIServerClient) DeleteComputeTemplate(request *api.DeleteComp
99100
// Finds a specific compute template by its name and namespace.
100101
func (krc *KuberayAPIServerClient) GetComputeTemplate(request *api.GetComputeTemplateRequest) (*api.ComputeTemplate, *rpcStatus.Status, error) {
101102
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/compute_templates/" + request.Name
102-
httpRequest, err := http.NewRequest("GET", getURL, nil)
103+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
103104
if err != nil {
104105
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
105106
}
@@ -120,7 +121,7 @@ func (krc *KuberayAPIServerClient) GetComputeTemplate(request *api.GetComputeTem
120121
// GetAllComputeTemplates finds all compute templates in all namespaces.
121122
func (krc *KuberayAPIServerClient) GetAllComputeTemplates() (*api.ListAllComputeTemplatesResponse, *rpcStatus.Status, error) {
122123
getURL := krc.baseURL + "/apis/v1/compute_templates"
123-
httpRequest, err := http.NewRequest("GET", getURL, nil)
124+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
124125
if err != nil {
125126
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
126127
}
@@ -141,7 +142,7 @@ func (krc *KuberayAPIServerClient) GetAllComputeTemplates() (*api.ListAllCompute
141142
// GetAllComputeTemplatesInNamespace Finds all compute templates in a given namespace.
142143
func (krc *KuberayAPIServerClient) GetAllComputeTemplatesInNamespace(request *api.ListComputeTemplatesRequest) (*api.ListComputeTemplatesResponse, *rpcStatus.Status, error) {
143144
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/compute_templates"
144-
httpRequest, err := http.NewRequest("GET", getURL, nil)
145+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
145146
if err != nil {
146147
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
147148
}
@@ -168,7 +169,7 @@ func (krc *KuberayAPIServerClient) CreateCluster(request *api.CreateClusterReque
168169
return nil, nil, fmt.Errorf("failed to marshal api.Cluster to JSON: %w", err)
169170
}
170171

171-
httpRequest, err := http.NewRequest("POST", createURL, bytes.NewReader(bytez))
172+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "POST", createURL, bytes.NewReader(bytez))
172173
if err != nil {
173174
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", createURL, err)
174175
}
@@ -196,7 +197,7 @@ func (krc *KuberayAPIServerClient) DeleteCluster(request *api.DeleteClusterReque
196197
// GetCluster finds a specific Cluster by ID.
197198
func (krc *KuberayAPIServerClient) GetCluster(request *api.GetClusterRequest) (*api.Cluster, *rpcStatus.Status, error) {
198199
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/clusters/" + request.Name
199-
httpRequest, err := http.NewRequest("GET", getURL, nil)
200+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
200201
if err != nil {
201202
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
202203
}
@@ -217,7 +218,7 @@ func (krc *KuberayAPIServerClient) GetCluster(request *api.GetClusterRequest) (*
217218
// ListCluster finds all clusters in a given namespace.
218219
func (krc *KuberayAPIServerClient) ListClusters(request *api.ListClustersRequest) (*api.ListClustersResponse, *rpcStatus.Status, error) {
219220
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/clusters"
220-
httpRequest, err := http.NewRequest("GET", getURL, nil)
221+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
221222
if err != nil {
222223
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
223224
}
@@ -243,7 +244,7 @@ func (krc *KuberayAPIServerClient) ListClusters(request *api.ListClustersRequest
243244
// ListAllClusters finds all Clusters in all namespaces. Supports pagination, and sorting on certain fields.
244245
func (krc *KuberayAPIServerClient) ListAllClusters(request *api.ListAllClustersRequest) (*api.ListAllClustersResponse, *rpcStatus.Status, error) {
245246
getURL := krc.baseURL + "/apis/v1/clusters"
246-
httpRequest, err := http.NewRequest("GET", getURL, nil)
247+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
247248
if err != nil {
248249
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
249250
}
@@ -274,7 +275,7 @@ func (krc *KuberayAPIServerClient) CreateRayJob(request *api.CreateRayJobRequest
274275
return nil, nil, fmt.Errorf("failed to marshal api.Cluster to JSON: %w", err)
275276
}
276277

277-
httpRequest, err := http.NewRequest("POST", createURL, bytes.NewReader(bytez))
278+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "POST", createURL, bytes.NewReader(bytez))
278279
if err != nil {
279280
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", createURL, err)
280281
}
@@ -296,7 +297,7 @@ func (krc *KuberayAPIServerClient) CreateRayJob(request *api.CreateRayJobRequest
296297
// GetRayJob finds a specific job by its name and namespace.
297298
func (krc *KuberayAPIServerClient) GetRayJob(request *api.GetRayJobRequest) (*api.RayJob, *rpcStatus.Status, error) {
298299
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/jobs/" + request.Name
299-
httpRequest, err := http.NewRequest("GET", getURL, nil)
300+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
300301
if err != nil {
301302
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
302303
}
@@ -317,7 +318,7 @@ func (krc *KuberayAPIServerClient) GetRayJob(request *api.GetRayJobRequest) (*ap
317318
// Finds all job in a given namespace.
318319
func (krc *KuberayAPIServerClient) ListRayJobs(request *api.ListRayJobsRequest) (*api.ListRayJobsResponse, *rpcStatus.Status, error) {
319320
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/jobs"
320-
httpRequest, err := http.NewRequest("GET", getURL, nil)
321+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
321322
if err != nil {
322323
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
323324
}
@@ -343,7 +344,7 @@ func (krc *KuberayAPIServerClient) ListRayJobs(request *api.ListRayJobsRequest)
343344
// ListAllRayJobs Finds all job in all namespaces.
344345
func (krc *KuberayAPIServerClient) ListAllRayJobs() (*api.ListAllRayJobsResponse, *rpcStatus.Status, error) {
345346
getURL := krc.baseURL + "/apis/v1/jobs"
346-
httpRequest, err := http.NewRequest("GET", getURL, nil)
347+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
347348
if err != nil {
348349
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
349350
}
@@ -375,7 +376,7 @@ func (krc *KuberayAPIServerClient) CreateRayService(request *api.CreateRayServic
375376
return nil, nil, fmt.Errorf("failed to marshal api.Cluster to JSON: %w", err)
376377
}
377378

378-
httpRequest, err := http.NewRequest("POST", createURL, bytes.NewReader(bytez))
379+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "POST", createURL, bytes.NewReader(bytez))
379380
if err != nil {
380381
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", createURL, err)
381382
}
@@ -402,7 +403,7 @@ func (krc *KuberayAPIServerClient) UpdateRayService(request *api.UpdateRayServic
402403
return nil, nil, fmt.Errorf("failed to marshal api.Cluster to JSON: %w", err)
403404
}
404405

405-
httpRequest, err := http.NewRequest("PUT", updateURL, bytes.NewReader(bytez))
406+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "PUT", updateURL, bytes.NewReader(bytez))
406407
if err != nil {
407408
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", updateURL, err)
408409
}
@@ -424,7 +425,7 @@ func (krc *KuberayAPIServerClient) UpdateRayService(request *api.UpdateRayServic
424425
// Find a specific ray serve by name and namespace.
425426
func (krc *KuberayAPIServerClient) GetRayService(request *api.GetRayServiceRequest) (*api.RayService, *rpcStatus.Status, error) {
426427
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/services/" + request.Name
427-
httpRequest, err := http.NewRequest("GET", getURL, nil)
428+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
428429
if err != nil {
429430
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
430431
}
@@ -445,7 +446,7 @@ func (krc *KuberayAPIServerClient) GetRayService(request *api.GetRayServiceReque
445446
// Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields.
446447
func (krc *KuberayAPIServerClient) ListRayServices(request *api.ListRayServicesRequest) (*api.ListRayServicesResponse, *rpcStatus.Status, error) {
447448
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/services"
448-
httpRequest, err := http.NewRequest("GET", getURL, nil)
449+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
449450
if err != nil {
450451
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
451452
}
@@ -466,7 +467,7 @@ func (krc *KuberayAPIServerClient) ListRayServices(request *api.ListRayServicesR
466467
// Finds all ray services in a given namespace. Supports pagination, and sorting on certain fields.
467468
func (krc *KuberayAPIServerClient) ListAllRayServices() (*api.ListAllRayServicesResponse, *rpcStatus.Status, error) {
468469
getURL := krc.baseURL + "/apis/v1/services"
469-
httpRequest, err := http.NewRequest("GET", getURL, nil)
470+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
470471
if err != nil {
471472
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
472473
}
@@ -498,7 +499,7 @@ func (krc *KuberayAPIServerClient) SubmitRayJob(request *api.SubmitRayJobRequest
498499
return nil, nil, fmt.Errorf("failed to marshal api.Cluster to JSON: %w", err)
499500
}
500501

501-
httpRequest, err := http.NewRequest("POST", createURL, bytes.NewReader(bytez))
502+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "POST", createURL, bytes.NewReader(bytez))
502503
if err != nil {
503504
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", createURL, err)
504505
}
@@ -520,7 +521,7 @@ func (krc *KuberayAPIServerClient) SubmitRayJob(request *api.SubmitRayJobRequest
520521
// GetRayJobDetails. Get details about specific job on a given cluster.
521522
func (krc *KuberayAPIServerClient) GetRayJobDetails(request *api.GetJobDetailsRequest) (*api.JobSubmissionInfo, *rpcStatus.Status, error) {
522523
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/jobsubmissions/" + request.Clustername + "/" + request.Submissionid
523-
httpRequest, err := http.NewRequest("GET", getURL, nil)
524+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
524525
if err != nil {
525526
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
526527
}
@@ -541,7 +542,7 @@ func (krc *KuberayAPIServerClient) GetRayJobDetails(request *api.GetJobDetailsRe
541542
// GetRayJobLog. Get log for a specific job on a given cluster.
542543
func (krc *KuberayAPIServerClient) GetRayJobLog(request *api.GetJobLogRequest) (*api.GetJobLogReply, *rpcStatus.Status, error) {
543544
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/jobsubmissions/" + request.Clustername + "/log/" + request.Submissionid
544-
httpRequest, err := http.NewRequest("GET", getURL, nil)
545+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
545546
if err != nil {
546547
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
547548
}
@@ -562,7 +563,7 @@ func (krc *KuberayAPIServerClient) GetRayJobLog(request *api.GetJobLogRequest) (
562563
// ListRayJobsCluster. List Ray jobs on a given cluster.
563564
func (krc *KuberayAPIServerClient) ListRayJobsCluster(request *api.ListJobDetailsRequest) (*api.ListJobSubmissionInfo, *rpcStatus.Status, error) {
564565
getURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/jobsubmissions/" + request.Clustername
565-
httpRequest, err := http.NewRequest("GET", getURL, nil)
566+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "GET", getURL, nil)
566567
if err != nil {
567568
return nil, nil, fmt.Errorf("failed to create http request for url '%s': %w", getURL, err)
568569
}
@@ -584,7 +585,7 @@ func (krc *KuberayAPIServerClient) ListRayJobsCluster(request *api.ListJobDetail
584585
func (krc *KuberayAPIServerClient) StopRayJob(request *api.StopRayJobSubmissionRequest) (*rpcStatus.Status, error) {
585586
createURL := krc.baseURL + "/apis/v1/namespaces/" + request.Namespace + "/jobsubmissions/" + request.Clustername + "/" + request.Submissionid
586587

587-
httpRequest, err := http.NewRequest("POST", createURL, nil)
588+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "POST", createURL, nil)
588589
if err != nil {
589590
return nil, fmt.Errorf("failed to create http request for url '%s': %w", createURL, err)
590591
}
@@ -606,7 +607,7 @@ func (krc *KuberayAPIServerClient) DeleteRayJobCluster(request *api.DeleteRayJob
606607
}
607608

608609
func (krc *KuberayAPIServerClient) doDelete(deleteURL string) (*rpcStatus.Status, error) {
609-
httpRequest, err := http.NewRequest("DELETE", deleteURL, nil)
610+
httpRequest, err := http.NewRequestWithContext(context.TODO(), "DELETE", deleteURL, nil)
610611
if err != nil {
611612
return nil, fmt.Errorf("failed to create http request for url '%s': %w", deleteURL, err)
612613
}

‎apiserver/pkg/http/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ func TestAPIServerClientError(t *testing.T) {
1010
httpErr := KuberayAPIServerClientError{
1111
HTTPStatusCode: 500,
1212
}
13-
require.Equal(t, httpErr.Error(), "kuberay api server request failed with HTTP status (500: Internal Server Error)")
13+
require.Equal(t, "kuberay api server request failed with HTTP status (500: Internal Server Error)", httpErr.Error())
1414
}

‎apiserver/pkg/model/converter.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,12 @@ func FromKubeToAPIComputeTemplates(configMaps []*corev1.ConfigMap) []*api.Comput
446446
func FromCrdToAPIJobs(jobs []*rayv1api.RayJob) []*api.RayJob {
447447
apiJobs := make([]*api.RayJob, 0)
448448
for _, job := range jobs {
449-
apiJobs = append(apiJobs, FromCrdToApiJob(job))
449+
apiJobs = append(apiJobs, FromCrdToAPIJob(job))
450450
}
451451
return apiJobs
452452
}
453453

454-
func FromCrdToApiJob(job *rayv1api.RayJob) (pbJob *api.RayJob) {
454+
func FromCrdToAPIJob(job *rayv1api.RayJob) (pbJob *api.RayJob) {
455455
defer func() {
456456
err := recover()
457457
if err != nil {
@@ -529,12 +529,12 @@ func FromCrdToAPIServices(
529529
) []*api.RayService {
530530
apiServices := make([]*api.RayService, 0)
531531
for _, service := range services {
532-
apiServices = append(apiServices, FromCrdToApiService(service, serviceEventsMap[service.Name]))
532+
apiServices = append(apiServices, FromCrdToAPIService(service, serviceEventsMap[service.Name]))
533533
}
534534
return apiServices
535535
}
536536

537-
func FromCrdToApiService(service *rayv1api.RayService, events []corev1.Event) *api.RayService {
537+
func FromCrdToAPIService(service *rayv1api.RayService, events []corev1.Event) *api.RayService {
538538
defer func() {
539539
err := recover()
540540
if err != nil {

‎apiserver/pkg/model/converter_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ func tolerationToString(toleration *api.PodToleration) string {
643643
}
644644

645645
func TestPopulateJob(t *testing.T) {
646-
job := FromCrdToApiJob(&JobNewClusterTest)
646+
job := FromCrdToAPIJob(&JobNewClusterTest)
647647
fmt.Printf("jobWithCluster = %#v\n", job)
648648
assert.Equal(t, "test", job.Name)
649649
assert.Equal(t, "test", job.Namespace)
@@ -652,7 +652,7 @@ func TestPopulateJob(t *testing.T) {
652652
assert.Nil(t, job.ClusterSelector)
653653
assert.NotNil(t, job.ClusterSpec)
654654

655-
job = FromCrdToApiJob(&JobExistingClusterTest)
655+
job = FromCrdToAPIJob(&JobExistingClusterTest)
656656
fmt.Printf("jobReferenceCluster = %#v\n", job)
657657
assert.Equal(t, "test", job.Name)
658658
assert.Equal(t, "test", job.Namespace)
@@ -661,7 +661,7 @@ func TestPopulateJob(t *testing.T) {
661661
assert.NotNil(t, job.ClusterSelector)
662662
assert.Nil(t, job.ClusterSpec)
663663

664-
job = FromCrdToApiJob(&JobExistingClusterSubmitterTest)
664+
job = FromCrdToAPIJob(&JobExistingClusterSubmitterTest)
665665
fmt.Printf("jobReferenceCluster = %#v\n", job)
666666
assert.Equal(t, "test", job.Name)
667667
assert.Equal(t, "test", job.Namespace)
@@ -672,7 +672,7 @@ func TestPopulateJob(t *testing.T) {
672672
assert.Equal(t, "image", job.JobSubmitter.Image)
673673
assert.Equal(t, "2", job.JobSubmitter.Cpu)
674674

675-
job = FromCrdToApiJob(&JobWithOutputTest)
675+
job = FromCrdToAPIJob(&JobWithOutputTest)
676676
fmt.Printf("jobWithOutput = %#v\n", job)
677677
assert.Equal(t, time.Date(2024, 0o7, 25, 0, 0, 0, 0, time.UTC), job.StartTime.AsTime())
678678
assert.Nil(t, job.EndTime)

‎apiserver/pkg/server/job_server.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (s *RayJobServer) CreateRayJob(ctx context.Context, request *api.CreateRayJ
4141
return nil, util.Wrap(err, "Create Job failed.")
4242
}
4343

44-
return model.FromCrdToApiJob(job), nil
44+
return model.FromCrdToAPIJob(job), nil
4545
}
4646

4747
// Finds a specific Job by job name.
@@ -59,7 +59,7 @@ func (s *RayJobServer) GetRayJob(ctx context.Context, request *api.GetRayJobRequ
5959
return nil, util.Wrap(err, "Get cluster failed.")
6060
}
6161

62-
return model.FromCrdToApiJob(job), nil
62+
return model.FromCrdToAPIJob(job), nil
6363
}
6464

6565
// Finds all Jobs in a given namespace.

0 commit comments

Comments
 (0)