[Feature] [history server] Support token auth in the history server collector #5078
+710
−28
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,6 +6,12 @@ metadata: | |||||
| name: raycluster-historyserver | ||||||
| namespace: default | ||||||
| spec: | ||||||
| # Uncomment to make the Dashboard reject unauthenticated requests, which the collector | ||||||
| # sidecars below must survive (ray-project/kuberay#5056). The operator rejects | ||||||
| # `authOptions.mode: token` unless `rayVersion` is set and is at least 2.52.0. | ||||||
|
win5923 marked this conversation as resolved.
Outdated
|
||||||
| # rayVersion: "2.52.0" | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
ditto |
||||||
| # authOptions: | ||||||
| # mode: token | ||||||
| headGroupSpec: | ||||||
| rayStartParams: | ||||||
| dashboard-host: 0.0.0.0 | ||||||
|
|
@@ -84,6 +90,17 @@ spec: | |||||
| # endpoints above. Accepts Go duration format (e.g., "30s", "1m", "5m"). | ||||||
| - name: RAY_COLLECTOR_POLL_INTERVAL | ||||||
| value: "30s" | ||||||
| # Ray token auth (optional): uncomment when the RayCluster sets | ||||||
| # `spec.authOptions.mode: token` (which also requires `spec.rayVersion`, unset here). | ||||||
| # Without the token the collector gets 401 from the Dashboard during NodeID discovery. | ||||||
|
win5923 marked this conversation as resolved.
Outdated
|
||||||
| # - name: RAY_AUTH_TOKEN | ||||||
| # valueFrom: | ||||||
| # secretKeyRef: | ||||||
| # name: ${RAY_CLUSTER} # defaults to the RayCluster name | ||||||
| # key: auth_token | ||||||
| # For `spec.authOptions.enableK8sTokenAuth` (Ray 2.55.0+) set | ||||||
| # RAY_ENABLE_K8S_TOKEN_AUTH="true" instead, plus a projected ServiceAccount token | ||||||
| # volume at /var/run/secrets/ray.io/serviceaccount. | ||||||
|
win5923 marked this conversation as resolved.
Outdated
|
||||||
| command: | ||||||
| - collector | ||||||
| - --role=Head | ||||||
|
|
@@ -158,6 +175,13 @@ spec: | |||||
| value: *rayTmpRoot | ||||||
| - name: GCS_BUCKET | ||||||
| value: "${GCS_BUCKET}" | ||||||
| # Ray token auth (optional): workers query the Dashboard through FQ_RAY_IP for their | ||||||
| # Ray NodeID, so they need the same token as the head collector. | ||||||
|
win5923 marked this conversation as resolved.
Outdated
|
||||||
| # - name: RAY_AUTH_TOKEN | ||||||
| # valueFrom: | ||||||
| # secretKeyRef: | ||||||
| # name: ${RAY_CLUSTER} # defaults to the RayCluster name | ||||||
| # key: auth_token | ||||||
| command: | ||||||
| - collector | ||||||
| - --role=Worker | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,12 @@ metadata: | |
| name: raycluster-historyserver | ||
| namespace: default | ||
| spec: | ||
| # Uncomment to make the Dashboard reject unauthenticated requests, which the collector | ||
| # sidecars below must survive (ray-project/kuberay#5056). The operator rejects | ||
| # `authOptions.mode: token` unless `rayVersion` is set and is at least 2.52.0. | ||
| # rayVersion: "2.52.0" | ||
| # authOptions: | ||
| # mode: token | ||
| headGroupSpec: | ||
| rayStartParams: | ||
| dashboard-host: 0.0.0.0 | ||
|
|
@@ -99,6 +105,19 @@ spec: | |
| value: "test" | ||
| - name: S3FORCE_PATH_STYLE | ||
| value: "true" | ||
| # Ray token auth (optional): uncomment when the RayCluster sets | ||
| # `spec.authOptions.mode: token` (which also requires `spec.rayVersion`, commented out | ||
| # above). Without the token the collector gets 401 from the Dashboard during NodeID | ||
| # discovery and crash-loops. The operator generates this Secret from the RayCluster name | ||
| # when `authOptions.secretName` is unset. | ||
| # - name: RAY_AUTH_TOKEN | ||
| # valueFrom: | ||
| # secretKeyRef: | ||
| # name: raycluster-historyserver # defaults to the RayCluster name | ||
| # key: auth_token | ||
| # For `spec.authOptions.enableK8sTokenAuth` (Ray 2.55.0+) set | ||
| # RAY_ENABLE_K8S_TOKEN_AUTH="true" instead, plus a projected ServiceAccount token | ||
| # volume at /var/run/secrets/ray.io/serviceaccount. | ||
|
win5923 marked this conversation as resolved.
Outdated
win5923 marked this conversation as resolved.
Outdated
|
||
| command: | ||
| - collector | ||
| - --role=Head | ||
|
|
@@ -189,6 +208,13 @@ spec: | |
| value: "true" | ||
| - name: S3DISABLE_SSL | ||
| value: "true" | ||
| # Ray token auth (optional): workers query the Dashboard through FQ_RAY_IP for their | ||
| # Ray NodeID, so they need the same token as the head collector. | ||
| # - name: RAY_AUTH_TOKEN | ||
| # valueFrom: | ||
| # secretKeyRef: | ||
| # name: raycluster-historyserver # defaults to the RayCluster name | ||
| # key: auth_token | ||
| command: | ||
| - collector | ||
| - --role=Worker | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,8 @@ require ( | |
| github.com/fsnotify/fsnotify v1.9.0 | ||
| github.com/fsouza/fake-gcs-server v1.53.1 | ||
| github.com/hashicorp/golang-lru/v2 v2.0.7 | ||
| github.com/onsi/gomega v1.38.3 | ||
| github.com/ray-project/kuberay/ray-operator v1.6.2 | ||
| github.com/sirupsen/logrus v1.9.3 | ||
| github.com/stretchr/testify v1.11.1 | ||
| google.golang.org/api v0.264.0 | ||
|
|
@@ -35,32 +35,30 @@ require ( | |
| github.com/evanphx/json-patch/v5 v5.9.11 // indirect | ||
| github.com/fxamacker/cbor/v2 v2.9.0 // indirect | ||
| github.com/go-logr/logr v1.4.3 // indirect | ||
| github.com/go-openapi/jsonpointer v0.22.4 // indirect | ||
| github.com/go-openapi/jsonreference v0.21.4 // indirect | ||
| github.com/go-openapi/swag v0.25.4 // indirect | ||
| github.com/go-task/slim-sprig/v3 v3.0.0 // indirect | ||
| github.com/gogo/protobuf v1.3.2 // indirect | ||
| github.com/google/btree v1.1.3 // indirect | ||
| github.com/google/gnostic-models v0.7.1 // indirect | ||
| github.com/google/go-cmp v0.7.0 | ||
| github.com/google/pprof v0.0.0-20251213031049-b05bdaca462f // indirect | ||
| github.com/google/uuid v1.6.0 // indirect | ||
| github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect | ||
| github.com/jmespath/go-jmespath v0.4.0 // indirect | ||
| github.com/json-iterator/go v1.1.12 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect | ||
| github.com/onsi/ginkgo/v2 v2.27.3 // indirect | ||
| github.com/openshift/api v0.0.0-20251214014457-bfa868a22401 // indirect | ||
| github.com/prometheus/client_golang v1.23.2 // indirect | ||
| github.com/prometheus/client_model v0.6.2 // indirect | ||
| github.com/prometheus/common v0.67.4 // indirect | ||
| github.com/prometheus/procfs v0.19.2 // indirect | ||
| github.com/spf13/pflag v1.0.10 // indirect | ||
| github.com/x448/float16 v0.8.4 // indirect | ||
| go.opentelemetry.io/otel v1.39.0 // indirect | ||
| go.opentelemetry.io/otel/trace v1.39.0 // indirect | ||
|
|
@@ -77,16 +75,16 @@ require ( | |
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| k8s.io/api v0.35.0 | ||
| k8s.io/apiextensions-apiserver v0.34.3 // indirect | ||
| k8s.io/apiserver v0.34.3 // indirect | ||
| k8s.io/component-base v0.34.3 // indirect | ||
| k8s.io/klog/v2 v2.130.1 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect | ||
| k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 // indirect | ||
| sigs.k8s.io/gateway-api v1.4.1 // indirect | ||
| sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect | ||
| sigs.k8s.io/randfill v1.0.0 // indirect | ||
| sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect | ||
| sigs.k8s.io/yaml v1.6.0 // indirect | ||
| ) | ||
|
|
||
|
|
@@ -111,6 +109,17 @@ require ( | |
| github.com/felixge/httpsnoop v1.0.4 // indirect | ||
| github.com/go-jose/go-jose/v4 v4.1.3 // indirect | ||
| github.com/go-logr/stdr v1.2.2 // indirect | ||
| github.com/go-openapi/swag/cmdutils v0.25.4 // indirect | ||
| github.com/go-openapi/swag/conv v0.25.4 // indirect | ||
| github.com/go-openapi/swag/fileutils v0.25.4 // indirect | ||
| github.com/go-openapi/swag/jsonname v0.25.4 // indirect | ||
| github.com/go-openapi/swag/jsonutils v0.25.4 // indirect | ||
| github.com/go-openapi/swag/loading v0.25.4 // indirect | ||
| github.com/go-openapi/swag/mangling v0.25.4 // indirect | ||
| github.com/go-openapi/swag/netutils v0.25.4 // indirect | ||
| github.com/go-openapi/swag/stringutils v0.25.4 // indirect | ||
| github.com/go-openapi/swag/typeutils v0.25.4 // indirect | ||
| github.com/go-openapi/swag/yamlutils v0.25.4 // indirect | ||
| github.com/golang-jwt/jwt/v5 v5.3.0 // indirect | ||
| github.com/google/renameio/v2 v2.0.0 // indirect | ||
| github.com/google/s2a-go v0.1.9 // indirect | ||
|
|
@@ -124,6 +133,8 @@ require ( | |
| github.com/pkg/xattr v0.4.12 // indirect | ||
| github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect | ||
| github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect | ||
| github.com/robfig/cron/v3 v3.0.1 // indirect | ||
| github.com/smallnest/chanx v1.2.0 // indirect | ||
| github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect | ||
| go.opencensus.io v0.24.0 // indirect | ||
| go.opentelemetry.io/auto/sdk v1.2.1 // indirect | ||
|
|
@@ -136,7 +147,7 @@ require ( | |
| golang.org/x/crypto v0.47.0 // indirect | ||
| golang.org/x/mod v0.31.0 // indirect | ||
| golang.org/x/tools v0.40.0 // indirect | ||
| gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect | ||
| google.golang.org/genproto v0.0.0-20251202230838-ff82c1b0f217 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d // indirect | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.