Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Feature] Make head serviceType optional #851

Merged
merged 4 commits into from
Jan 1, 2023
Merged

[Feature] Make head serviceType optional #851

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8745ee6
make serviceType optional
kevin85421 Dec 30, 2022
e77d7b3
remove serviceType
kevin85421 Dec 30, 2022
4192a42
update helm chart
kevin85421 Dec 30, 2022
7734c0a
add comments
kevin85421 Dec 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/guidance/volcano-integration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ metadata:
spec:
rayVersion: '2.2.0'
headGroupSpec:
serviceType: ClusterIP
rayStartParams:
block: 'true'
replicas: 1
Expand Down Expand Up @@ -108,7 +107,6 @@ metadata:
spec:
rayVersion: '2.2.0'
headGroupSpec:
serviceType: ClusterIP
rayStartParams:
block: 'true'
replicas: 1
Expand Down Expand Up @@ -222,7 +220,6 @@ metadata:
spec:
rayVersion: '2.2.0'
headGroupSpec:
serviceType: ClusterIP
rayStartParams:
block: 'true'
replicas: 1
Expand Down
1 change: 0 additions & 1 deletion helm-chart/kuberay-operator/crds/ray.io_rayclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5706,7 +5706,6 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
Expand Down
1 change: 0 additions & 1 deletion helm-chart/kuberay-operator/crds/ray.io_rayjobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5970,7 +5970,6 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
Expand Down
1 change: 0 additions & 1 deletion helm-chart/kuberay-operator/crds/ray.io_rayservices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5956,7 +5956,6 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
Expand Down
5 changes: 3 additions & 2 deletions helm-chart/ray-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,5 +199,6 @@ additionalWorkerGroups:
name: log-volume
sidecarContainers: []

service:
type: ClusterIP
# Configuration for Head's Kubernetes Service
service: {}
# type: ClusterIP # The default type is ClusterIP.
2 changes: 1 addition & 1 deletion ray-operator/apis/ray/v1alpha1/raycluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type RayClusterSpec struct {
// HeadGroupSpec are the spec for the head pod
type HeadGroupSpec struct {
// ServiceType is Kubernetes service type of the head service. it will be used by the workers to connect to the head pod
ServiceType v1.ServiceType `json:"serviceType"`
ServiceType v1.ServiceType `json:"serviceType,omitempty"`
Jeffwan marked this conversation as resolved.
Show resolved Hide resolved
// EnableIngress indicates whether operator should create ingress object for head service or not.
EnableIngress *bool `json:"enableIngress,omitempty"`
// HeadGroupSpec.Replicas is deprecated and ignored; there can only be one head pod per Ray cluster.
Expand Down
1 change: 0 additions & 1 deletion ray-operator/config/crd/bases/ray.io_rayclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5706,7 +5706,6 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
Expand Down
1 change: 0 additions & 1 deletion ray-operator/config/crd/bases/ray.io_rayjobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5970,7 +5970,6 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
Expand Down
1 change: 0 additions & 1 deletion ray-operator/config/crd/bases/ray.io_rayservices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5956,7 +5956,6 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray-cluster.autoscaler.large.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ spec:
memory: "512Mi"
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block --port=6379 ...
rayStartParams:
# Flag "no-monitor" will be automatically set when autoscaling is enabled.
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray-cluster.autoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ spec:
memory: "512Mi"
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block ...
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray-cluster.complete.large.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ spec:
rayVersion: '2.2.0'
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# for the head group, replicas should always be 1.
# headGroupSpec.replicas is deprecated in KubeRay >= 0.3.0.
replicas: 1
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray-cluster.complete.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ spec:
rayVersion: '2.2.0'
# Ray head pod configuration
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block --dashboard-host: '0.0.0.0' ...
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
1 change: 0 additions & 1 deletion ray-operator/config/samples/ray-cluster.external-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ metadata:
spec:
rayVersion: '2.2.0'
headGroupSpec:
serviceType: ClusterIP
replicas: 1
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray-cluster.getting-started.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ spec:
rayVersion: '2.2.0' # should match the Ray version in the image of the containers
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block ...
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray-cluster.heterogeneous.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ spec:
######################headGroupSpecs#################################
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block ...
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray-cluster.mini.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ spec:
rayVersion: '2.2.0' # should match the Ray version in the image of the containers
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block --redis-port=6379 ...
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray_v1alpha1_rayjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ spec:
rayVersion: '2.2.0' # should match the Ray version in the image of the containers
# Ray head pod template
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block --redis-port=6379 ...
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/samples/ray_v1alpha1_rayservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ spec:
######################headGroupSpecs#################################
# Ray head pod template.
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block --redis-port=6379 ...
rayStartParams:
port: '6379' # should match container port named gcs-server
Expand Down
2 changes: 0 additions & 2 deletions ray-operator/config/security/ray-cluster.pod-security.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ spec:
rayVersion: '2.2.0'
# Ray head pod configuration
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# for the head group, replicas should always be 1.
# headGroupSpec.replicas is deprecated in KubeRay >= 0.3.0.
replicas: 1
Expand Down
2 changes: 0 additions & 2 deletions tests/config/ray-cluster.mini.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ spec:
######################headGroupSpecs#################################
# head group template and specs, (perhaps 'group' is not needed in the name)
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block ...
rayStartParams:
dashboard-host: '0.0.0.0'
Expand Down
2 changes: 0 additions & 2 deletions tests/config/ray-cluster.ray-ft.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ metadata:
spec:
rayVersion: '$ray_version'
headGroupSpec:
serviceType: ClusterIP
replicas: 1
kevin85421 marked this conversation as resolved.
Show resolved Hide resolved
rayStartParams:
dashboard-host: '0.0.0.0'
num-cpus: '1'
Expand Down
2 changes: 0 additions & 2 deletions tests/config/ray-service.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ spec:
######################headGroupSpecs#################################
# head group template and specs, (perhaps 'group' is not needed in the name)
headGroupSpec:
# Kubernetes Service Type, valid values are 'ClusterIP', 'NodePort' and 'LoadBalancer'
serviceType: ClusterIP
# the following params are used to complete the ray start: ray start --head --block ...
rayStartParams:
port: '6379' # should match container port named gcs-server
Expand Down