Skip to content

Commit 1daadda

Browse files
[RayJob] Add token authentication support for light weight job submitter (#4215)
* [RayJob] light weight job submitter auth token support Signed-off-by: Future-Outlier <[email protected]> * X-Ray-Authorization Signed-off-by: Rueian <[email protected]> --------- Signed-off-by: Future-Outlier <[email protected]> Signed-off-by: Rueian <[email protected]> Co-authored-by: Rueian <[email protected]>
1 parent 4df3f2e commit 1daadda

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

ray-operator/rayjob-submitter/cmd/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ func main() {
6464
}
6565
rayDashboardClient := &dashboardclient.RayDashboardClient{}
6666
address = rayjobsubmitter.JobSubmissionURL(address)
67-
rayDashboardClient.InitClient(&http.Client{Timeout: time.Second * 10}, address, "")
67+
authToken := os.Getenv("RAY_AUTH_TOKEN")
68+
rayDashboardClient.InitClient(&http.Client{Timeout: time.Second * 10}, address, authToken)
6869
submissionId, err := rayDashboardClient.SubmitJobReq(context.Background(), &req)
6970
if err != nil {
7071
if strings.Contains(err.Error(), "Please use a different submission_id") {
@@ -76,7 +77,7 @@ func main() {
7677
fmt.Fprintf(os.Stdout, "SUCC -- Job '%s' submitted successfully\n", submissionId)
7778
}
7879
fmt.Fprintf(os.Stdout, "INFO -- Tailing logs until the job finishes:\n")
79-
err = rayjobsubmitter.TailJobLogs(address, submissionId, os.Stdout)
80+
err = rayjobsubmitter.TailJobLogs(address, submissionId, authToken, os.Stdout)
8081
exitOnError(err)
8182
}
8283

ray-operator/rayjob-submitter/rayjob-submitter.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,22 @@ func logTailingURL(address, submissionId string) (string, error) {
3131
return address, nil
3232
}
3333

34-
func TailJobLogs(address, submissionId string, out io.Writer) error {
34+
func TailJobLogs(address, submissionId string, authToken string, out io.Writer) error {
3535
wsAddr, err := logTailingURL(address, submissionId)
3636
if err != nil {
3737
return err
3838
}
39-
c, _, err := websocket.Dial(context.Background(), wsAddr, nil)
39+
40+
var dialOptions *websocket.DialOptions
41+
if authToken != "" {
42+
dialOptions = &websocket.DialOptions{
43+
HTTPHeader: map[string][]string{
44+
"X-Ray-Authorization": {fmt.Sprintf("Bearer %s", authToken)},
45+
},
46+
}
47+
}
48+
49+
c, _, err := websocket.Dial(context.Background(), wsAddr, dialOptions)
4050
if err != nil {
4151
return err
4252
}

0 commit comments

Comments
 (0)