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.

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

feat: upgrade ray -> 2.7 #863

Merged
merged 11 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
8 changes: 4 additions & 4 deletions ray/helm/kuberay-operator/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: kuberay-operator
repository: https://kevin85421.github.io/kuberay
version: 0.3.0
digest: sha256:abb43e05246ec58ef6137df26d2d1692f59066058695b84d17986e5622d82690
generated: "2022-09-21T15:06:07.583379+02:00"
repository: https://ray-project.github.io/kuberay-helm/
version: 0.6.0
digest: sha256:68767f4de687430221785f64d5b752285141d2192cae4c91a55b13d40106d063
generated: "2023-10-05T14:25:03.985572273-07:00"
6 changes: 3 additions & 3 deletions ray/helm/kuberay-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: kuberay-operator
description: A Helm chart for Kubernetes
type: application
version: 0.1.3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you'll need to bump this as well

appVersion: "v0.3.0"
appVersion: "v0.6.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

appVersion here should be v2.7.0 (the version of ray itself)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in ray/helm/ray/Chart.yaml i have the appVersion set to 2.7.0. since this chart.yaml is for kuberay i put the kuberay operator version, i can switch this to 2.7.0 but just want to double check

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh i didn't realize, that's probably fine.

dependencies:
- name: kuberay-operator
version: 0.3.0
repository: https://kevin85421.github.io/kuberay
version: 0.6.0
repository: https://ray-project.github.io/kuberay-helm/
Binary file not shown.
Binary file not shown.
155 changes: 151 additions & 4 deletions ray/helm/kuberay-operator/crds/ray.io_rayclusters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,28 @@ spec:
singular: raycluster
scope: Namespaced
versions:
- name: v1alpha1
- additionalPrinterColumns:
- jsonPath: .status.desiredWorkerReplicas
name: desired workers
type: integer
- jsonPath: .status.availableWorkerReplicas
name: available workers
type: integer
- jsonPath: .status.state
name: status
type: string
- jsonPath: .metadata.creationTimestamp
name: age
type: date
- jsonPath: .status.head.podIP
name: head pod IP
priority: 1
type: string
- jsonPath: .status.head.serviceIP
name: head service IP
priority: 1
type: string
name: v1alpha1
schema:
openAPIV3Schema:
description: RayCluster is the Schema for the RayClusters API
Expand Down Expand Up @@ -205,6 +226,113 @@ spec:
resources required.
type: object
type: object
securityContext:
description: SecurityContext defines the security options the
container should be run with.
properties:
allowPrivilegeEscalation:
description: AllowPrivilegeEscalation controls whether a process
can gain more privileges than its parent process
type: boolean
capabilities:
description: The capabilities to add/drop when running containers.
properties:
add:
description: Added capabilities
items:
description: Capability represent POSIX capabilities
type
type: string
type: array
drop:
description: Removed capabilities
items:
description: Capability represent POSIX capabilities
type
type: string
type: array
type: object
privileged:
description: Run container in privileged mode.
type: boolean
procMount:
description: procMount denotes the type of proc mount to use
for the containers.
type: string
readOnlyRootFilesystem:
description: Whether this container has a read-only root filesystem.
Default is false.
type: boolean
runAsGroup:
description: The GID to run the entrypoint of the container
process. Uses runtime default if unset.
format: int64
type: integer
runAsNonRoot:
description: Indicates that the container must run as a non-root
user.
type: boolean
runAsUser:
description: The UID to run the entrypoint of the container
process.
format: int64
type: integer
seLinuxOptions:
description: The SELinux context to be applied to the container.
properties:
level:
description: Level is SELinux level label that applies
to the container.
type: string
role:
description: Role is a SELinux role label that applies
to the container.
type: string
type:
description: Type is a SELinux type label that applies
to the container.
type: string
user:
description: User is a SELinux user label that applies
to the container.
type: string
type: object
seccompProfile:
description: The seccomp options to use by this container.
properties:
localhostProfile:
description: localhostProfile indicates a profile defined
in a file on the node should be used.
type: string
type:
description: type indicates which kind of seccomp profile
will be applied.
type: string
required:
- type
type: object
windowsOptions:
description: The Windows specific settings applied to all
containers.
properties:
gmsaCredentialSpec:
description: GMSACredentialSpec is where the GMSA admission
webhook (https://github.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use.
type: string
hostProcess:
description: HostProcess determines if a container should
be run as a 'Host Process' container.
type: boolean
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process.
type: string
type: object
type: object
upscalingMode:
description: UpscalingMode is "Conservative", "Default", or "Aggressive.
enum:
Expand Down Expand Up @@ -5599,12 +5727,15 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
additionalProperties:
type: string
type: object
rayVersion:
description: RayVersion is the version of ray being used. this affects
the command used to start ray
description: RayVersion is the version of ray being used. This determines
the autoscaler's image version.
type: string
workerGroupSpecs:
description: WorkerGroupSpecs are the specs for the worker pods
Expand Down Expand Up @@ -11122,6 +11253,14 @@ spec:
type: string
description: Service Endpoints
type: object
head:
description: Head info
properties:
podIP:
type: string
serviceIP:
type: string
type: object
lastUpdateTime:
description: LastUpdateTime indicates last update timestamp for this
cluster status.
Expand All @@ -11138,6 +11277,14 @@ spec:
each node group.
format: int32
type: integer
observedGeneration:
description: observedGeneration is the most recent generation observed
for this RayCluster.
format: int64
type: integer
reason:
description: Reason provides more information about current State
type: string
state:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
of cluster Important: Run "make" to regenerat'
Expand Down
141 changes: 137 additions & 4 deletions ray/helm/kuberay-operator/crds/ray.io_rayjobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,115 @@ spec:
compute resources required.
type: object
type: object
securityContext:
description: SecurityContext defines the security options
the container should be run with.
properties:
allowPrivilegeEscalation:
description: AllowPrivilegeEscalation controls whether
a process can gain more privileges than its parent process
type: boolean
capabilities:
description: The capabilities to add/drop when running
containers.
properties:
add:
description: Added capabilities
items:
description: Capability represent POSIX capabilities
type
type: string
type: array
drop:
description: Removed capabilities
items:
description: Capability represent POSIX capabilities
type
type: string
type: array
type: object
privileged:
description: Run container in privileged mode.
type: boolean
procMount:
description: procMount denotes the type of proc mount
to use for the containers.
type: string
readOnlyRootFilesystem:
description: Whether this container has a read-only root
filesystem. Default is false.
type: boolean
runAsGroup:
description: The GID to run the entrypoint of the container
process. Uses runtime default if unset.
format: int64
type: integer
runAsNonRoot:
description: Indicates that the container must run as
a non-root user.
type: boolean
runAsUser:
description: The UID to run the entrypoint of the container
process.
format: int64
type: integer
seLinuxOptions:
description: The SELinux context to be applied to the
container.
properties:
level:
description: Level is SELinux level label that applies
to the container.
type: string
role:
description: Role is a SELinux role label that applies
to the container.
type: string
type:
description: Type is a SELinux type label that applies
to the container.
type: string
user:
description: User is a SELinux user label that applies
to the container.
type: string
type: object
seccompProfile:
description: The seccomp options to use by this container.
properties:
localhostProfile:
description: localhostProfile indicates a profile
defined in a file on the node should be used.
type: string
type:
description: type indicates which kind of seccomp
profile will be applied.
type: string
required:
- type
type: object
windowsOptions:
description: The Windows specific settings applied to
all containers.
properties:
gmsaCredentialSpec:
description: GMSACredentialSpec is where the GMSA
admission webhook (https://github.
type: string
gmsaCredentialSpecName:
description: GMSACredentialSpecName is the name of
the GMSA credential spec to use.
type: string
hostProcess:
description: HostProcess determines if a container
should be run as a 'Host Process' container.
type: boolean
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process.
type: string
type: object
type: object
upscalingMode:
description: UpscalingMode is "Conservative", "Default", or
"Aggressive.
Expand Down Expand Up @@ -5861,12 +5970,15 @@ spec:
type: object
required:
- rayStartParams
- serviceType
- template
type: object
headServiceAnnotations:
additionalProperties:
type: string
type: object
rayVersion:
description: RayVersion is the version of ray being used. this
affects the command used to start ray
description: RayVersion is the version of ray being used. This
determines the autoscaler's image version.
type: string
workerGroupSpecs:
description: WorkerGroupSpecs are the specs for the worker pods
Expand Down Expand Up @@ -11656,10 +11768,15 @@ spec:
of cluster Important: Run "make" to regenerat'
type: string
jobStatus:
description: JobStatus is the Ray Job Status. https://docs.ray.io/en/latest/cluster/jobs-package-ref.
description: JobStatus is the Ray Job Status.
type: string
message:
type: string
observedGeneration:
description: observedGeneration is the most recent generation observed
for this RayJob.
format: int64
type: integer
rayClusterName:
type: string
rayClusterStatus:
Expand All @@ -11680,6 +11797,14 @@ spec:
type: string
description: Service Endpoints
type: object
head:
description: Head info
properties:
podIP:
type: string
serviceIP:
type: string
type: object
lastUpdateTime:
description: LastUpdateTime indicates last update timestamp for
this cluster status.
Expand All @@ -11696,6 +11821,14 @@ spec:
of each node group.
format: int32
type: integer
observedGeneration:
description: observedGeneration is the most recent generation
observed for this RayCluster.
format: int64
type: integer
reason:
description: Reason provides more information about current State
type: string
state:
description: 'INSERT ADDITIONAL STATUS FIELD - define observed
state of cluster Important: Run "make" to regenerat'
Expand Down
Loading
Loading