ray-project · kevin85421 · Jan 30, 2024 · Jan 30, 2024
diff --git 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.0.0
+version: 1.1.0-alpha.0
diff --git a/helm-chart/kuberay-apiserver/README.md b/helm-chart/kuberay-apiserver/README.md
@@ -16,8 +16,8 @@ helm version
   ```sh
   helm repo add kuberay https://ray-project.github.io/kuberay-helm/
 
-  # Install the KubeRay API Server at Version v0.6.0.
-  helm install kuberay-apiserver kuberay/kuberay-apiserver --version 0.6.0
+  # Install the KubeRay API Server at Version v1.0.0.
+  helm install kuberay-apiserver kuberay/kuberay-apiserver --version 1.0.0
 
   # Check that the KubeRay API Server is running in the "default" namespaces.
   kubectl get pods
@@ -42,7 +42,7 @@ To list the `kuberay-apiserver` release:
 ```sh
 helm ls
 # NAME                      NAMESPACE       REVISION        UPDATED                                    STATUS         CHART
-# kuberay-apiserver         default         1               2022-12-02 02:13:37.514445313 +0000 UTC    deployed       kuberay-apiserver-0.6.0
+# kuberay-apiserver         default         1               2022-12-02 02:13:37.514445313 +0000 UTC    deployed       kuberay-apiserver-1.0.0
 ```
 
 ## Uninstall the Chart

diff --git a/helm-chart/kuberay-apiserver/templates/deployment.yaml b/helm-chart/kuberay-apiserver/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
-        {{- toYaml .Values.containerPort | nindent 8 }}
+          {{- toYaml .Values.containerPort | nindent 8 }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         livenessProbe:
@@ -43,6 +43,35 @@ spec:
           httpGet:
             path: /healthz
             port: http
+      {{- if .Values.security }}
+      - name: security-proxy-container
+        image: "{{ .Values.security.proxy.repository }}:{{ .Values.security.proxy.tag }}"
+        imagePullPolicy: {{ .Values.security.proxy.pullPolicy }}
+        ports:
+          - name: http
+            containerPort: {{ .Values.security.env.HTTP_LOCAL_PORT }}
+            protocol: TCP
+          - name: grpc
+            containerPort: {{ .Values.security.env.GRPC_LOCAL_PORT }}
+            protocol: TCP
+        env:
+          {{- range $key, $value := .Values.security.env }}
+          - name: {{ $key }}
+            value: {{ $value | quote }}
+          {{- end }}
+          {{- range $port := .Values.containerPort  }}
+            {{- if eq $port.name "http" }}
+          - name: "HTTP_REMOTE_PORT"
+            value: {{ $port.containerPort | quote }}
+            {{- end }}
+            {{- if eq $port.name "grpc" }}
+          - name: "GRPC_REMOTE_PORT"
+            value: {{ $port.containerPort | quote }}
+            {{- end }}
+          {{- end }}
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
+      {{- end }}
 
       {{- if .Values.sidecarContainers }}
       {{- toYaml .Values.sidecarContainers | nindent 6 }}

diff --git a/helm-chart/kuberay-apiserver/templates/role.yaml b/helm-chart/kuberay-apiserver/templates/role.yaml
@@ -1,4 +1,3 @@
-
 {{- if .Values.rbacEnable }}
 apiVersion: rbac.authorization.k8s.io/v1
 {{- if .Values.singleNamespaceInstall }}

diff --git a/helm-chart/kuberay-apiserver/templates/rolebinding.yaml b/helm-chart/kuberay-apiserver/templates/rolebinding.yaml
@@ -19,6 +19,6 @@ roleRef:
   {{- else }}
   kind: ClusterRole
   {{- end }}
-  name: {{ include "kuberay-apiserver.fullname" . }}
+  name: {{ .Values.name }}
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
diff --git a/helm-chart/kuberay-apiserver/templates/service.yaml b/helm-chart/kuberay-apiserver/templates/service.yaml
@@ -14,4 +14,20 @@ spec:
     app.kubernetes.io/component: {{ include "kuberay-apiserver.name" . }}
     app.kubernetes.io/name: {{ .Release.Name }}
   ports:
-    {{- toYaml .Values.service.ports | nindent 12 }}
+    {{- range $port := .Values.service.ports  }}
+    - name: {{ $port.name }}
+      port: {{ $port.port }}
+      {{- if $.Values.security }}
+        {{- if eq $port.name "http" }}
+      targetPort: {{ $.Values.security.env.HTTP_LOCAL_PORT }}
+        {{ else }}
+      targetPort: {{ $.Values.security.env.GRPC_LOCAL_PORT }}
+        {{ end }}
+      {{ else }}
+      targetPort: {{ $port.targetPort }}
+      {{ end }}
+      {{- if $port.nodePort }}
+      nodePort: {{ $port.nodePort }}
+      {{ end }}
+    {{ end }}
+
diff --git 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: kuberay/apiserver
-  tag: v1.0.0
+  tag: v1.1.0-alpha.0
   pullPolicy: IfNotPresent
 
 ## Install Default RBAC roles and bindings
@@ -74,3 +74,16 @@ rbacEnable: true
 
 # the chart can be installed by users with permissions to a single namespace only
 singleNamespaceInstall: false
+
+# security definition. Comment it out if security is not required
+security:
+  proxy:
+    repository: kuberay/security-proxy
+    tag: nightly
+    pullPolicy: IfNotPresent
+  env:
+    HTTP_LOCAL_PORT: 8988
+    GRPC_LOCAL_PORT: 8987
+    SECURITY_TOKEN: "12345"
+    SECURITY_PREFIX: "/"
+    ENABLE_GRPC: "true"
diff --git 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.0.0
+version: 1.1.0-alpha.0
 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/README.md b/helm-chart/kuberay-operator/README.md
@@ -16,8 +16,8 @@ helm version
   ```sh
   helm repo add kuberay https://ray-project.github.io/kuberay-helm/
 
-  # Install both CRDs and KubeRay operator v1.0.0-rc.1.
-  helm install kuberay-operator kuberay/kuberay-operator --version 1.0.0-rc.1
+  # Install both CRDs and KubeRay operator v1.0.0.
+  helm install kuberay-operator kuberay/kuberay-operator --version 1.0.0
 
   # Check the KubeRay operator Pod in `default` namespace
   kubectl get pods
@@ -40,10 +40,10 @@ helm version
   * 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=v1.0.0-rc.1&timeout=90s"
+  kubectl create -k "github.com/ray-project/kuberay/manifests/cluster-scope-resources?ref=v1.0.0&timeout=90s"
 
   # Step 2: Install KubeRay operator only. (for developer)
-  helm install kuberay-operator kuberay/kuberay-operator --version 1.0.0-rc.1 --skip-crds
+  helm install kuberay-operator kuberay/kuberay-operator --version 1.0.0 --skip-crds
   ``` 
 
 ## List the chart
@@ -53,7 +53,7 @@ To list the `my-release` deployment:
 ```sh
 helm ls
 # NAME                    NAMESPACE       REVISION        UPDATED                                 STATUS          CHART                           APP VERSION
-# kuberay-operator        default         1               2023-09-22 02:57:17.306616331 +0000 UTC deployed        kuberay-operator-1.0.0-rc.1
+# kuberay-operator        default         1               2023-09-22 02:57:17.306616331 +0000 UTC deployed        kuberay-operator-1.0.0
 ```
 
 ## Uninstall the Chart