From ad104f9637cf4b9d41cb359f0c2854411d9839bb Mon Sep 17 00:00:00 2001
From: Kai-Hsun Chen <kaihsun@anyscale.com>
Date: Fri, 2 Sep 2022 16:40:09 -0700
Subject: [PATCH] Fix Helm chart default configuration (#530)

Fix default Helm configuration.
---
 helm-chart/kuberay-operator/README.md |  4 ++--
 helm-chart/ray-cluster/README.md      | 18 ++++++++++++++----
 helm-chart/ray-cluster/values.yaml    |  6 +++---
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/helm-chart/kuberay-operator/README.md b/helm-chart/kuberay-operator/README.md
index cc44706fbf..70c1d84e48 100644
--- a/helm-chart/kuberay-operator/README.md
+++ b/helm-chart/kuberay-operator/README.md
@@ -18,7 +18,7 @@ version.BuildInfo{Version:"v3.6.2", GitCommit:"ee407bdf364942bcb8e8c665f82e15aa2
 
 To avoid duplicate CRD definitions in this repo, we reuse CRD config in `ray-operator`:
 ```console
-$ kubectl create -k "github.com/ray-project/kuberay/ray-operator/config/crd?ref=v0.3.0"
+$ kubectl create -k "github.com/ray-project/kuberay/ray-operator/config/crd?ref=v0.3.0&timeout=90s"
 ```
 > Note that we must use `kubectl create` to install the CRDs.
 > The corresponding `kubectl apply` command will not work. See [KubeRay issue #271](https://github.com/ray-project/kuberay/issues/271).
@@ -33,7 +33,7 @@ $ helm install kuberay-operator --namespace ray-system --create-namespace $(curl
 To list the `my-release` deployment:
 
 ```console
-$ helm list -n kuberay-operator
+$ helm list -n ray-system
 ```
 
 ## Uninstalling the Chart
diff --git a/helm-chart/ray-cluster/README.md b/helm-chart/ray-cluster/README.md
index 7501712d9f..1323d39c6d 100644
--- a/helm-chart/ray-cluster/README.md
+++ b/helm-chart/ray-cluster/README.md
@@ -13,15 +13,25 @@ version.BuildInfo{Version:"v3.6.2", GitCommit:"ee407bdf364942bcb8e8c665f82e15aa2
 
 ## TL;DR;
 
-```console
-$ helm install ray-cluster --namespace ray-system --create-namespace https://github.com/ray-project/kuberay/releases/download/v0.3.0/helm-chart-ray-cluster-0.1.0.tgz
+```bash
+# Because the ray-cluster chart in release 0.3.0 has some bugs, we need to clone the KubeRay repo and install the latest ray-cluster chart until release 0.4.0.
+cd helm-chart/ray-cluster
+helm install ray-cluster --namespace ray-system --create-namespace .
+
+# Not working until release 0.4.0.
+helm install ray-cluster --namespace ray-system --create-namespace https://github.com/ray-project/kuberay/releases/download/v0.4.0/helm-chart-ray-cluster-0.4.0.tgz
 ```
 
 ## Installing the Chart
 
 To install the chart with the release name `my-release`:
-```console
-$ helm install my-release --namespace ray-system --create-namespace https://github.com/ray-project/kuberay/releases/download/v0.3.0/helm-chart-ray-cluster-0.1.0.tgz
+```bash
+# Because the ray-cluster chart in release 0.3.0 has some bugs, we need to clone the KubeRay repo and install the latest ray-cluster chart until release 0.4.0.
+cd helm-chart/ray-cluster
+helm install my-release --namespace ray-system --create-namespace .
+
+# Not working until release 0.4.0.
+helm install my-release --namespace ray-system --create-namespace https://github.com/ray-project/kuberay/releases/download/v0.4.0/helm-chart-ray-cluster-0.4.0.tgz
 ```
 
 > note: The chart will submit a RayCluster.
diff --git a/helm-chart/ray-cluster/values.yaml b/helm-chart/ray-cluster/values.yaml
index 2c7571fb8f..7744315d8d 100644
--- a/helm-chart/ray-cluster/values.yaml
+++ b/helm-chart/ray-cluster/values.yaml
@@ -4,10 +4,10 @@
 
 image:
   repository: rayproject/ray
-  tag: latest
+  tag: 2.0.0
   pullPolicy: IfNotPresent
 
-nameOverride: "ray"
+nameOverride: "kuberay"
 fullnameOverride: ""
 
 imagePullSecrets: []
@@ -38,7 +38,7 @@ head:
     limits:
       cpu: 1
     requests:
-       cpu: 200m
+       cpu: 1
   annotations: {}
   nodeSelector: {}
   tolerations: []