diff --git a/ray/helm/kuberay-operator/Chart.lock b/ray/helm/kuberay-operator/Chart.lock index 139a77337..4de922255 100644 --- a/ray/helm/kuberay-operator/Chart.lock +++ b/ray/helm/kuberay-operator/Chart.lock @@ -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" diff --git a/ray/helm/kuberay-operator/Chart.yaml b/ray/helm/kuberay-operator/Chart.yaml index e90255063..287d1a1c7 100644 --- a/ray/helm/kuberay-operator/Chart.yaml +++ b/ray/helm/kuberay-operator/Chart.yaml @@ -2,9 +2,9 @@ apiVersion: v2 name: kuberay-operator description: A Helm chart for Kubernetes type: application -version: 0.1.3 -appVersion: "v0.3.0" +version: 0.1.4 +appVersion: "v0.6.0" 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/ diff --git a/ray/helm/kuberay-operator/charts/kuberay-operator-0.3.0.tgz b/ray/helm/kuberay-operator/charts/kuberay-operator-0.3.0.tgz deleted file mode 100644 index 293b2eda9..000000000 Binary files a/ray/helm/kuberay-operator/charts/kuberay-operator-0.3.0.tgz and /dev/null differ diff --git a/ray/helm/kuberay-operator/charts/kuberay-operator-0.6.0.tgz b/ray/helm/kuberay-operator/charts/kuberay-operator-0.6.0.tgz new file mode 100644 index 000000000..00851a027 Binary files /dev/null and b/ray/helm/kuberay-operator/charts/kuberay-operator-0.6.0.tgz differ diff --git a/ray/helm/kuberay-operator/crds/ray.io_rayclusters.yaml b/ray/helm/kuberay-operator/crds/ray.io_rayclusters.yaml index d2ce5baf3..062032188 100644 --- a/ray/helm/kuberay-operator/crds/ray.io_rayclusters.yaml +++ b/ray/helm/kuberay-operator/crds/ray.io_rayclusters.yaml @@ -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 @@ -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: @@ -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 @@ -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. @@ -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' diff --git a/ray/helm/kuberay-operator/crds/ray.io_rayjobs.yaml b/ray/helm/kuberay-operator/crds/ray.io_rayjobs.yaml index 5b19903d1..46e3c1ca6 100644 --- a/ray/helm/kuberay-operator/crds/ray.io_rayjobs.yaml +++ b/ray/helm/kuberay-operator/crds/ray.io_rayjobs.yaml @@ -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. @@ -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 @@ -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: @@ -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. @@ -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' diff --git a/ray/helm/kuberay-operator/crds/ray.io_rayservices.yaml b/ray/helm/kuberay-operator/crds/ray.io_rayservices.yaml index b51c8017b..70056ed2b 100644 --- a/ray/helm/kuberay-operator/crds/ray.io_rayservices.yaml +++ b/ray/helm/kuberay-operator/crds/ray.io_rayservices.yaml @@ -217,6 +217,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. @@ -5847,12 +5956,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 @@ -11736,6 +11848,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. @@ -11752,6 +11872,15 @@ 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' @@ -11760,7 +11889,7 @@ spec: serveDeploymentStatuses: items: description: ServeDeploymentStatus defines the current state - of Serve Deployment + of a Serve deployment properties: healthLastUpdateTime: description: Keep track of how long the service is healthy. @@ -11773,7 +11902,7 @@ spec: type: string name: description: Name, Status, Message are from Ray Dashboard - to represent the state of a serve deployment. + and represent a Serve deployment's state. type: string status: description: 'TODO: change status type to enum' @@ -11781,6 +11910,11 @@ spec: type: object type: array type: object + observedGeneration: + description: observedGeneration is the most recent generation observed + for this RayService. + format: int64 + type: integer pendingServiceStatus: description: Pending Service Status indicates a RayCluster will be created or is being created. @@ -11835,6 +11969,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. @@ -11851,6 +11993,15 @@ 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' @@ -11859,7 +12010,7 @@ spec: serveDeploymentStatuses: items: description: ServeDeploymentStatus defines the current state - of Serve Deployment + of a Serve deployment properties: healthLastUpdateTime: description: Keep track of how long the service is healthy. @@ -11872,7 +12023,7 @@ spec: type: string name: description: Name, Status, Message are from Ray Dashboard - to represent the state of a serve deployment. + and represent a Serve deployment's state. type: string status: description: 'TODO: change status type to enum' diff --git a/ray/helm/kuberay-operator/values.yaml b/ray/helm/kuberay-operator/values.yaml index 6d25d42b1..c2781d3cc 100644 --- a/ray/helm/kuberay-operator/values.yaml +++ b/ray/helm/kuberay-operator/values.yaml @@ -1,6 +1,6 @@ kuberay-operator: image: repository: dkr.plural.sh/ray/kuberay/operator - tag: 2a7f0f2 + tag: v0.6.0 metrics: enabled: true diff --git a/ray/helm/ray/Chart.lock b/ray/helm/ray/Chart.lock index f1ac79826..2ea75aefa 100644 --- a/ray/helm/ray/Chart.lock +++ b/ray/helm/ray/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: oauth2-proxy repository: https://oauth2-proxy.github.io/manifests - version: 6.2.7 -digest: sha256:48aff6bf5fe4978a7d837382579de9a468fec0d37c879ce7035fc2d1a23c1915 -generated: "2022-09-27T16:50:40.3297+02:00" + version: 6.12.1 +digest: sha256:93729f3b6ab0180ba08f03989328daeab2a80d7b71e530b5d681b4dc88c6178b +generated: "2023-06-02T16:38:57.184953+02:00" diff --git a/ray/helm/ray/Chart.yaml b/ray/helm/ray/Chart.yaml index 06b3c405a..a08b3ebb3 100644 --- a/ray/helm/ray/Chart.yaml +++ b/ray/helm/ray/Chart.yaml @@ -2,10 +2,10 @@ apiVersion: v2 name: ray description: helm chart for ray type: application -version: 0.1.8 -appVersion: "2.0.0" +version: 0.1.9 +appVersion: "2.7.0" dependencies: - name: oauth2-proxy - version: 6.2.7 + version: 6.12.1 repository: https://oauth2-proxy.github.io/manifests condition: oauth2-proxy.enabled diff --git a/ray/helm/ray/charts/oauth2-proxy-6.12.1.tgz b/ray/helm/ray/charts/oauth2-proxy-6.12.1.tgz new file mode 100644 index 000000000..a3c9cc249 Binary files /dev/null and b/ray/helm/ray/charts/oauth2-proxy-6.12.1.tgz differ diff --git a/ray/helm/ray/charts/oauth2-proxy-6.2.7.tgz b/ray/helm/ray/charts/oauth2-proxy-6.2.7.tgz deleted file mode 100644 index 0389a0fb1..000000000 Binary files a/ray/helm/ray/charts/oauth2-proxy-6.2.7.tgz and /dev/null differ diff --git a/ray/helm/ray/values.yaml b/ray/helm/ray/values.yaml index ce0134cae..9cdd25578 100644 --- a/ray/helm/ray/values.yaml +++ b/ray/helm/ray/values.yaml @@ -4,7 +4,7 @@ image: repository: dkr.plural.sh/ray/rayproject/ray - tag: 2.0.0 + tag: 2.7.0 pullPolicy: IfNotPresent nameOverride: "" @@ -101,7 +101,7 @@ workers: - groupName: small-group image: repository: dkr.plural.sh/ray/rayproject/ray - tag: 2.0.0 + tag: 2.7.0 replicas: 0 minReplicas: 0 maxReplicas: 10 @@ -164,7 +164,7 @@ oauth2-proxy: fullnameOverride: ray-oauth2-proxy image: repository: dkr.plural.sh/oauth2-proxy/oauth2-proxy/oauth2-proxy - tag: v7.3.0 + tag: v7.4.0 resources: limits: diff --git a/ray/repository.yaml b/ray/repository.yaml index 547a954d3..6b79312a1 100644 --- a/ray/repository.yaml +++ b/ray/repository.yaml @@ -12,3 +12,5 @@ oauthSettings: tags: - tag: AI - tag: automation +contributors: + - troyyyang@gmail.com diff --git a/ray/vendor_images.yaml b/ray/vendor_images.yaml index a25d5ad04..b1b01cbe7 100644 --- a/ray/vendor_images.yaml +++ b/ray/vendor_images.yaml @@ -1,7 +1,4 @@ docker.io: - images: - kuberay/operator: - - 2a7f0f2 images-by-tag-regex: # the below regex can be used to limit the regex range so that only versions >= v2.0.0 are matched rayproject/ray: ^v?(?:(?:[^0-1]{1})?(?:[2-9]{1}|[0-9]{2}))+\.[0-9]+?\.[0-9]+(?:-gpu)?$