From eba8da689d23a20674bb6155b26679840bcf7be8 Mon Sep 17 00:00:00 2001
From: "wuhua.ck" <wuhua.ck@alibaba-inc.com>
Date: Wed, 2 Feb 2022 22:12:23 +0800
Subject: [PATCH 1/5] add crd rbac in helm

---
 helm-chart/kubray-operator/README.md           | 5 +++++
 helm-chart/kubray-operator/templates/role.yaml | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/helm-chart/kubray-operator/README.md b/helm-chart/kubray-operator/README.md
index 9a6a46e5c2..c4308aeeda 100644
--- a/helm-chart/kubray-operator/README.md
+++ b/helm-chart/kubray-operator/README.md
@@ -16,6 +16,11 @@ version.BuildInfo{Version:"v3.6.2", GitCommit:"ee407bdf364942bcb8e8c665f82e15aa2
 
 ## Installing the Chart
 
+To avoid duplicate CRD definitions in this repo, we reuse CRD config in `ray-operator`:
+```console
+$ kubectl apply -k "kuberay/ray-operator/config/crd"
+```
+
 Please use command below:
 ```console
 $ helm install kuberay-operator . --values values.yaml --namespace kuberay-operator --create-namespace
diff --git a/helm-chart/kubray-operator/templates/role.yaml b/helm-chart/kubray-operator/templates/role.yaml
index 9ffdbdc682..d69d58bdb4 100644
--- a/helm-chart/kubray-operator/templates/role.yaml
+++ b/helm-chart/kubray-operator/templates/role.yaml
@@ -48,4 +48,10 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - "ray.io"
+  resources:
+  - rayclusters
+  verbs:
+  - "*"
 {{- end }}

From e265a11cf2ce3624f89804140d37cb621adcbf44 Mon Sep 17 00:00:00 2001
From: "wuhua.ck" <wuhua.ck@alibaba-inc.com>
Date: Wed, 2 Feb 2022 23:03:34 +0800
Subject: [PATCH 2/5] fix ray cluster volume

---
 helm-chart/ray-cluster/values.yaml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/helm-chart/ray-cluster/values.yaml b/helm-chart/ray-cluster/values.yaml
index d9c1e2da12..5b42ad6adc 100644
--- a/helm-chart/ray-cluster/values.yaml
+++ b/helm-chart/ray-cluster/values.yaml
@@ -25,6 +25,7 @@ head:
     dashboard-host: '0.0.0.0'
     num-cpus: '1' # can be auto-completed from the limits
     node-ip-address: $MY_POD_IP # auto-completed as the head pod IP
+    block: 'true'
   containerEnv:
     - name: MY_POD_IP
       valueFrom:
@@ -37,15 +38,11 @@ head:
        cpu: 200m
   annotations: {}
   volumes:
-    - name: config
-      configMap:
-        name: ray-code
-        items:
-          - key: code.py
-            path: code.py
+    - name: log-volume
+      emptyDir: { }
   volumeMounts:
-    - mountPath: /opt
-      name: config
+    - mountPath: /tmp/ray
+      name: log-volume
 
 
 worker:
@@ -57,6 +54,7 @@ worker:
   initArgs:
     node-ip-address: $MY_POD_IP
     redis-password: LetMeInRay
+    block: 'true'
   containerEnv:
     - name: MY_POD_IP
       valueFrom:
@@ -90,7 +88,7 @@ worker:
     - name: log-volume
       emptyDir: {}
   volumeMounts:
-    - mountPath: /var/log
+    - mountPath: /tmp/ray
       name: log-volume
 
 headServiceSuffix: "ray-operator.svc"

From 2a7e157ab3540cc9837cfaed75fd52fd2714f862 Mon Sep 17 00:00:00 2001
From: "wuhua.ck" <wuhua.ck@alibaba-inc.com>
Date: Wed, 2 Feb 2022 23:10:56 +0800
Subject: [PATCH 3/5] fix

---
 helm-chart/kubray-operator/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm-chart/kubray-operator/values.yaml b/helm-chart/kubray-operator/values.yaml
index f1b585c944..6efbc8e1fa 100644
--- a/helm-chart/kubray-operator/values.yaml
+++ b/helm-chart/kubray-operator/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: kuberay/operator
-  tag: v0.1.0
+  tag: nightly
   pullPolicy: IfNotPresent
 
 nameOverride: "kubray-operator"

From bad2e9f9fd3f204cde888a385e956c5d6a8fcb59 Mon Sep 17 00:00:00 2001
From: "wuhua.ck" <wuhua.ck@alibaba-inc.com>
Date: Wed, 2 Feb 2022 23:13:55 +0800
Subject: [PATCH 4/5] fix

---
 helm-chart/ray-cluster/values.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/helm-chart/ray-cluster/values.yaml b/helm-chart/ray-cluster/values.yaml
index 5b42ad6adc..e16bc5e80d 100644
--- a/helm-chart/ray-cluster/values.yaml
+++ b/helm-chart/ray-cluster/values.yaml
@@ -18,9 +18,6 @@ head:
     key: value
   initArgs:
     port: '6379'
-    object-manager-port: '12345'
-    node-manager-port: '12346'
-    object-store-memory: '100000000'
     redis-password: 'LetMeInRay'
     dashboard-host: '0.0.0.0'
     num-cpus: '1' # can be auto-completed from the limits

From 6fff7661227edafba0c409e64a4afe93bef6e863 Mon Sep 17 00:00:00 2001
From: chenk008 <kongchen28@gmail.com>
Date: Mon, 7 Feb 2022 10:08:40 +0800
Subject: [PATCH 5/5] Update helm-chart/kuberay-operator/README.md

Co-authored-by: Oliver Mannion <125105+tekumara@users.noreply.github.com>
---
 helm-chart/kuberay-operator/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm-chart/kuberay-operator/README.md b/helm-chart/kuberay-operator/README.md
index 2592fb2891..da4e689503 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 apply -k "kuberay/ray-operator/config/crd"
+$ kubectl apply -k "../../ray-operator/config/crd"
 ```
 
 Please use command below: