Remove unused fields from KubeRay operator and RayCluster charts (ray-project#839)

Some fields in KubeRay operator chart and RayCluster chart are useless. This PR removes those fields.

Signed-off-by: Kai-Hsun Chen <kaihsun@apache.org>

Author: kevin85421

docs/deploy/installation.md

@@ -26,7 +26,7 @@ helm install kuberay-operator kuberay/kuberay-operator
 #### Method 2: Kustomize
 ```sh
 # Install CRDs
-kubectl create -k "github.com/ray-project/kuberay/manifests/cluster-scope-resources?ref=v0.4.0"
+kubectl create -k "github.com/ray-project/kuberay/manifests/cluster-scope-resources?ref=v0.4.0&timeout=90s"
 
 # Install KubeRay operator
 kubectl apply -k "github.com/ray-project/kuberay/manifests/base?ref=v0.4.0"

helm-chart/kuberay-operator/README.md

@@ -35,6 +35,17 @@ helm version
   helm install kuberay-operator .
   ```
 
+* Install KubeRay operator without installing CRDs
+  * In some cases, the installation of the CRDs and the installation of the operator may require different levels of admin permissions, so these two installations could be handled as different steps by different roles.
+  * Use Helm's built-in `--skip-crds` flag to install the operator only. See [this document](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) for more details.
+  ```sh
+  # Step 1: Install CRDs only (for cluster admin)
+  kubectl create -k "github.com/ray-project/kuberay/manifests/cluster-scope-resources?ref=v0.4.0&timeout=90s"
+
+  # Step 2: Install KubeRay operator only. (for developer)
+  helm install kuberay-operator kuberay/kuberay-operator --version 0.4.0 --skip-crds
+  ``` 
+
 ## List the chart
 
 To list the `my-release` deployment:

helm-chart/kuberay-operator/values.yaml

@@ -10,11 +10,6 @@ image:
 nameOverride: "kuberay-operator"
 fullnameOverride: "kuberay-operator"
 
-## Install Default RBAC roles and bindings
-rbac:
-  create: true
-  apiVersion: v1
-
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -50,7 +45,6 @@ readinessProbe:
   periodSeconds: 5
   failureThreshold: 5
 
-createCustomResource: true
 rbacEnable: true
 
 batchScheduler:

helm-chart/ray-cluster/templates/raycluster-cluster.yaml

@@ -61,8 +61,12 @@ spec:
         nodeSelector: {{- toYaml .Values.head.nodeSelector | nindent 10 }}
       metadata:
         annotations: {{- toYaml .Values.head.annotations | nindent 10 }}
-        labels:
+        {{- if .Values.head.labels }}
+        labels: {{- toYaml .Values.head.labels | nindent 10 }}
 {{ include "ray-cluster.labels" . | indent 10 }}
+        {{ else }}
+        labels: {{ include "ray-cluster.labels" . | nindent 10 }}
+        {{- end }} 
 
   workerGroupSpecs:
   {{- range $groupName, $values := .Values.additionalWorkerGroups }}
@@ -117,8 +121,13 @@ spec:
         nodeSelector: {{- toYaml $values.nodeSelector | nindent 10 }}
       metadata:
         annotations: {{- toYaml $values.annotations | nindent 10 }}
-        labels:
+        {{- if $values.labels }}
+        labels: {{- toYaml $values.labels | nindent 10 }}
 {{ include "ray-cluster.labels" $ | indent 10 }}
+        {{ else }}
+        labels: {{ include "ray-cluster.labels" $ | nindent 10 }}
+        {{- end }} 
+
   {{- end }}
   {{- end }}
   {{- if ne (.Values.worker.disabled | default false) true }}
@@ -172,6 +181,10 @@ spec:
         nodeSelector: {{- toYaml .Values.worker.nodeSelector | nindent 10 }}
       metadata:
         annotations: {{- toYaml .Values.worker.annotations | nindent 10 }}
-        labels:
+        {{- if .Values.worker.labels }}
+        labels: {{- toYaml .Values.worker.labels | nindent 10 }}
 {{ include "ray-cluster.labels" . | indent 10 }}
+        {{ else }}
+        labels: {{ include "ray-cluster.labels" $ | nindent 10 }}
+        {{- end }}
   {{- end }}

helm-chart/ray-cluster/values.yaml

@@ -17,7 +17,6 @@ imagePullSecrets: []
   # - name: an-existing-secret
 
 head:
-  groupName: headgroup
   # 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.
@@ -39,8 +38,7 @@ head:
     #   requests:
     #     cpu: "500m"
     #     memory: "512Mi"
-  # labels:
-  #   key: value
+  labels: {}
   rayStartParams:
     dashboard-host: '0.0.0.0'
     block: 'true'
@@ -95,9 +93,7 @@ worker:
   # disabled: true
   groupName: workergroup
   replicas: 1
-  type: worker
-  # labels:
-  #   key: value
+  labels: {}
   rayStartParams:
     block: 'true'
   initContainerImage: 'busybox:1.28'  # Enable users to specify the image for init container. Users can pull the busybox image from their private repositories.
@@ -129,8 +125,7 @@ worker:
     requests:
       cpu: "1"
       memory: "1G"
-  annotations:
-    key: value
+  annotations: {}
   nodeSelector: {}
   tolerations: []
   affinity: {}
@@ -157,7 +152,6 @@ additionalWorkerGroups:
     replicas: 1
     minReplicas: 1
     maxReplicas: 3
-    type: worker
     labels: {}
     rayStartParams:
       block: 'true'
@@ -190,8 +184,7 @@ additionalWorkerGroups:
       requests:
         cpu: 1
         memory: "1G"
-    annotations:
-      key: value
+    annotations: {}
     nodeSelector: {}
     tolerations: []
     affinity: {}