From 83f9f528ebc0c96215bcefcc020e48ccd9a8c849 Mon Sep 17 00:00:00 2001 From: kaihsun Date: Sun, 29 Sep 2024 08:49:32 +0000 Subject: [PATCH] KubeRay v1.2.2 Signed-off-by: kaihsun --- helm-chart/kuberay-apiserver/Chart.yaml | 2 +- helm-chart/kuberay-apiserver/values.yaml | 2 +- helm-chart/kuberay-operator/Chart.yaml | 2 +- .../kuberay-operator/crds/ray.io_rayjobs.yaml | 2 -- .../templates/deployment.yaml | 5 ++++ helm-chart/kuberay-operator/values.yaml | 26 ++++++++++++++++++- helm-chart/ray-cluster/Chart.yaml | 2 +- .../templates/raycluster-cluster.yaml | 4 +++ helm-chart/ray-cluster/values.yaml | 4 +-- 9 files changed, 40 insertions(+), 9 deletions(-) diff --git a/helm-chart/kuberay-apiserver/Chart.yaml b/helm-chart/kuberay-apiserver/Chart.yaml index 5d26c2a..30e5993 100644 --- a/helm-chart/kuberay-apiserver/Chart.yaml +++ b/helm-chart/kuberay-apiserver/Chart.yaml @@ -15,4 +15,4 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.1 +version: 1.2.2 diff --git a/helm-chart/kuberay-apiserver/values.yaml b/helm-chart/kuberay-apiserver/values.yaml index 0440fdb..49f2ced 100644 --- a/helm-chart/kuberay-apiserver/values.yaml +++ b/helm-chart/kuberay-apiserver/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 name: "kuberay-apiserver" image: repository: quay.io/kuberay/apiserver - tag: v1.2.1 + tag: v1.2.2 pullPolicy: IfNotPresent ## Install Default RBAC roles and bindings diff --git a/helm-chart/kuberay-operator/Chart.yaml b/helm-chart/kuberay-operator/Chart.yaml index f1d8957..583a8a7 100644 --- a/helm-chart/kuberay-operator/Chart.yaml +++ b/helm-chart/kuberay-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 description: A Helm chart for Kubernetes name: kuberay-operator -version: 1.2.1 +version: 1.2.2 icon: https://github.com/ray-project/ray/raw/master/doc/source/images/ray_header_logo.png type: application diff --git a/helm-chart/kuberay-operator/crds/ray.io_rayjobs.yaml b/helm-chart/kuberay-operator/crds/ray.io_rayjobs.yaml index b17cb6e..f9b06f7 100644 --- a/helm-chart/kuberay-operator/crds/ray.io_rayjobs.yaml +++ b/helm-chart/kuberay-operator/crds/ray.io_rayjobs.yaml @@ -11381,8 +11381,6 @@ spec: default: 0 format: int32 type: integer - required: - - entrypoint type: object status: properties: diff --git a/helm-chart/kuberay-operator/templates/deployment.yaml b/helm-chart/kuberay-operator/templates/deployment.yaml index 878a495..a9cd9b5 100644 --- a/helm-chart/kuberay-operator/templates/deployment.yaml +++ b/helm-chart/kuberay-operator/templates/deployment.yaml @@ -57,9 +57,14 @@ spec: args: {{- $argList := list -}} {{- $argList = append $argList (include "kuberay.featureGates" . | trim) -}} + {{- if .Values.batchScheduler -}} {{- if .Values.batchScheduler.enabled -}} {{- $argList = append $argList "--enable-batch-scheduler" -}} {{- end -}} + {{- if .Values.batchScheduler.name -}} + {{- $argList = append $argList (printf "--batch-scheduler=%s" .Values.batchScheduler.name) -}} + {{- end -}} + {{- end -}} {{- $watchNamespace := "" -}} {{- if and .Values.singleNamespaceInstall (not .Values.watchNamespace) -}} {{- $watchNamespace = .Release.Namespace -}} diff --git a/helm-chart/kuberay-operator/values.yaml b/helm-chart/kuberay-operator/values.yaml index a7ebe29..6cde331 100644 --- a/helm-chart/kuberay-operator/values.yaml +++ b/helm-chart/kuberay-operator/values.yaml @@ -4,7 +4,7 @@ image: repository: quay.io/kuberay/operator - tag: v1.2.1 + tag: v1.2.2 pullPolicy: IfNotPresent nameOverride: "kuberay-operator" @@ -55,8 +55,32 @@ readinessProbe: periodSeconds: 5 failureThreshold: 5 +# Enable customized Kubernetes scheduler integration. If enabled, Ray workloads will be scheduled +# by the customized scheduler. +# * "enabled" is the legacy option and will be deprecated soon. +# * "name" is the standard option, expecting a scheduler name, supported values are +# "default", "volcano", and "yunikorn". +# +# Examples: +# 1. Use volcano (deprecated) +# batchScheduler: +# enabled: true +# +# 2. Use volcano +# batchScheduler: +# name: volcano +# +# 3. Use yunikorn +# batchScheduler: +# name: yunikorn +# batchScheduler: + # Deprecated. This option will be removed in the future. + # Note, for backwards compatibility. When it sets to true, it enables volcano scheduler integration. enabled: false + # Set the customized scheduler name, supported values are "volcano" or "yunikorn", do not set + # "batchScheduler.enabled=true" at the same time as it will override this option. + name: "" featureGates: - name: RayClusterStatusConditions diff --git a/helm-chart/ray-cluster/Chart.yaml b/helm-chart/ray-cluster/Chart.yaml index bb4f217..5e5b3a3 100644 --- a/helm-chart/ray-cluster/Chart.yaml +++ b/helm-chart/ray-cluster/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 description: A Helm chart for Kubernetes name: ray-cluster -version: 1.2.1 +version: 1.2.2 icon: https://github.com/ray-project/ray/raw/master/doc/source/images/ray_header_logo.png diff --git a/helm-chart/ray-cluster/templates/raycluster-cluster.yaml b/helm-chart/ray-cluster/templates/raycluster-cluster.yaml index 03072a3..b04fdbc 100644 --- a/helm-chart/ray-cluster/templates/raycluster-cluster.yaml +++ b/helm-chart/ray-cluster/templates/raycluster-cluster.yaml @@ -167,7 +167,9 @@ spec: {{- if $values.envFrom }} envFrom: {{- toYaml $values.envFrom | nindent 14 }} {{- end }} + {{- if $values.ports }} ports: {{- toYaml $values.ports | nindent 14}} + {{- end }} {{- if $values.lifecycle }} lifecycle: {{- toYaml $values.lifecycle | nindent 14 }} @@ -262,7 +264,9 @@ spec: {{- with .Values.worker.envFrom }} envFrom: {{- toYaml . | nindent 14}} {{- end }} + {{- if .Values.worker.ports }} ports: {{- toYaml .Values.worker.ports | nindent 14}} + {{- end }} {{- if .Values.worker.lifecycle }} lifecycle: {{- toYaml .Values.worker.lifecycle | nindent 14 }} diff --git a/helm-chart/ray-cluster/values.yaml b/helm-chart/ray-cluster/values.yaml index 6493f3a..ea430cf 100644 --- a/helm-chart/ray-cluster/values.yaml +++ b/helm-chart/ray-cluster/values.yaml @@ -7,7 +7,7 @@ image: repository: rayproject/ray - tag: 2.34.0 + tag: 2.9.0 pullPolicy: IfNotPresent nameOverride: "kuberay" @@ -26,7 +26,7 @@ common: head: # rayVersion determines the autoscaler's image version. # It should match the Ray version in the image of the containers. - # rayVersion: 2.34.0 + # rayVersion: 2.9.0 # If enableInTreeAutoscaling is true, the autoscaler sidecar will be added to the Ray head pod. # Ray autoscaler integration is supported only for Ray versions >= 1.11.0 # Ray autoscaler integration is Beta with KubeRay >= 0.3.0 and Ray >= 2.0.0.