Skip to content

Commit

Permalink
[release v0.5.1] Remove init container (#15)
Browse files Browse the repository at this point in the history
Remove init container
  • Loading branch information
kevin85421 committed Apr 17, 2023
1 parent ec4b9b9 commit c64831d
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 36 deletions.
2 changes: 1 addition & 1 deletion helm-chart/kuberay-apiserver/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 0.5.0
version: 0.5.1
6 changes: 3 additions & 3 deletions helm-chart/kuberay-apiserver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.0.
helm install kuberay-apiserver kuberay/kuberay-apiserver --version 0.4.0
# Install the KubeRay API Server at Version v0.5.0.
helm install kuberay-apiserver kuberay/kuberay-apiserver --version 0.5.0

# Check that the KubeRay API Server is running in the "default" namespaces.
kubectl get pods
Expand All @@ -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.4.0
# kuberay-apiserver default 1 2022-12-02 02:13:37.514445313 +0000 UTC deployed kuberay-apiserver-0.5.0
```

## Uninstall the Chart
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/kuberay-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
description: A Helm chart for Kubernetes
name: kuberay-operator
version: 0.5.0
version: 0.5.1
icon: https://github.com/ray-project/ray/raw/master/doc/source/images/ray_header_logo.png
type: application
14 changes: 7 additions & 7 deletions helm-chart/kuberay-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ helm version
```sh
helm repo add kuberay https://ray-project.github.io/kuberay-helm/

# Install both CRDs and KubeRay operator v0.4.0.
helm install kuberay-operator kuberay/kuberay-operator --version 0.4.0
# Install both CRDs and KubeRay operator v0.5.0.
helm install kuberay-operator kuberay/kuberay-operator --version 0.5.0

# Check the KubeRay operator Pod in `default` namespace
kubectl get pods
Expand All @@ -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=v0.4.0&timeout=90s"
kubectl create -k "github.com/ray-project/kuberay/manifests/cluster-scope-resources?ref=v0.5.0&timeout=90s"
# Step 2: Install KubeRay operator only. (for developer)
helm install kuberay-operator kuberay/kuberay-operator --version 0.4.0 --skip-crds
helm install kuberay-operator kuberay/kuberay-operator --version 0.5.0 --skip-crds
```
## List the chart
Expand All @@ -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 2022-12-02 02:13:37.514445313 +0000 UTC deployed kuberay-operator-0.4.0 1.0
# kuberay-operator default 1 2022-12-02 02:13:37.514445313 +0000 UTC deployed kuberay-operator-0.5.0 1.0
```
## Uninstall the Chart
Expand Down Expand Up @@ -83,7 +83,7 @@ spec:
project: default
source:
repoURL: https://github.com/ray-project/kuberay
targetRevision: v0.4.0
targetRevision: v0.5.0
path: helm-chart/kuberay-operator/crds
destination:
server: https://kubernetes.default.svc
Expand All @@ -103,7 +103,7 @@ metadata:
spec:
source:
repoURL: https://github.com/ray-project/kuberay
targetRevision: v0.4.0
targetRevision: v0.5.0
path: helm-chart/kuberay-operator
helm:
skipCrds: true
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/ray-cluster/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
description: A Helm chart for Kubernetes
name: ray-cluster
version: 0.5.0
version: 0.5.1
icon: https://github.com/ray-project/ray/raw/master/doc/source/images/ray_header_logo.png
8 changes: 4 additions & 4 deletions helm-chart/ray-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ kind create cluster
# Step 2: Register a Helm chart repo
helm repo add kuberay https://ray-project.github.io/kuberay-helm/

# Step 3: Install both CRDs and KubeRay operator v0.4.0.
helm install kuberay-operator kuberay/kuberay-operator --version 0.4.0
# Step 3: Install both CRDs and KubeRay operator v0.5.0.
helm install kuberay-operator kuberay/kuberay-operator --version 0.5.0

# Step 4: Install a RayCluster custom resource
# (For x86_64 users)
helm install raycluster kuberay/ray-cluster --version 0.4.0
helm install raycluster kuberay/ray-cluster --version 0.5.0
# (For arm64 users, e.g. Mac M1)
# See here for all available arm64 images: https://hub.docker.com/r/rayproject/ray/tags?page=1&name=aarch64
helm install raycluster kuberay/ray-cluster --version 0.4.0 --set image.tag=nightly-aarch64
helm install raycluster kuberay/ray-cluster --version 0.5.0 --set image.tag=nightly-aarch64

# Step 5: Verify the installation of KubeRay operator and RayCluster
kubectl get pods
Expand Down
12 changes: 0 additions & 12 deletions helm-chart/ray-cluster/templates/raycluster-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,6 @@ spec:
template:
spec:
imagePullSecrets: {{- toYaml $.Values.imagePullSecrets | nindent 10 }}
initContainers:
- name: init
image: {{ $values.initContainerImage | default "busybox:1.28" }}
command: ['sh', '-c', "until nslookup $FQ_RAY_IP; do echo waiting for K8s Service $FQ_RAY_IP; sleep 2; done"]
securityContext:
{{- toYaml $values.initContainerSecurityContext | nindent 14 }}
{{- if $values.serviceAccountName }}
serviceAccountName: {{ $values.serviceAccountName }}
{{- end }}
Expand Down Expand Up @@ -166,12 +160,6 @@ spec:
template:
spec:
imagePullSecrets: {{- toYaml .Values.imagePullSecrets | nindent 10 }}
initContainers:
- name: init
image: {{ .Values.worker.initContainerImage | default "busybox:1.28" }}
command: ['sh', '-c', "until nslookup $FQ_RAY_IP; do echo waiting for K8s Service $FQ_RAY_IP; sleep 2; done"]
securityContext:
{{- toYaml .Values.worker.initContainerSecurityContext | nindent 14 }}
{{- if .Values.worker.serviceAccountName }}
serviceAccountName: {{ .Values.worker.serviceAccountName }}
{{- end }}
Expand Down
7 changes: 0 additions & 7 deletions helm-chart/ray-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ head:
serviceAccountName: ""
rayStartParams:
dashboard-host: '0.0.0.0'
block: 'true'
# containerEnv specifies environment variables for the Ray container,
# Follows standard K8s container env schema.
containerEnv: []
Expand Down Expand Up @@ -109,9 +108,6 @@ worker:
serviceAccountName: ""
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.
# Security context for the init container.
initContainerSecurityContext: {}
# containerEnv specifies environment variables for the Ray container,
# Follows standard K8s container env schema.
containerEnv: []
Expand Down Expand Up @@ -173,9 +169,6 @@ additionalWorkerGroups:
serviceAccountName: ""
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.
# Security context for the init container.
initContainerSecurityContext: {}
# containerEnv specifies environment variables for the Ray container,
# Follows standard K8s container env schema.
containerEnv: []
Expand Down

0 comments on commit c64831d

Please sign in to comment.