From 7f833539fdbd1e40403132b45f81a0318d4d5d2b Mon Sep 17 00:00:00 2001
From: Dmitri Gekhtman <62982571+DmitriGekhtman@users.noreply.github.com>
Date: Thu, 8 Dec 2022 11:22:01 -0800
Subject: [PATCH] Switch to 0.4.0 and eliminate Chart app versions. (#810)

Why are these changes needed?
This PR updates version tags in the release branch to 0.4.0.
Once this PR is committed to the release branch, final 0.4.0 artifacts will be built from the branch.

This PR should only be merged once we're ready to go through with the final release.

Removing app version
I've made a decision here to remove appVersions for the Helm charts.
appVersion is optional and I don't believe we need an extra version string floating around.
I'm open to keeping appVersion if anyone thinks it's needed.

Signed-off-by: Dmitri Gekhtman <dmitri.m.gekhtman@gmail.com>
---
 helm-chart/kuberay-apiserver/Chart.yaml        | 8 +-------
 helm-chart/kuberay-apiserver/values.yaml       | 2 +-
 helm-chart/kuberay-operator/Chart.yaml         | 3 +--
 helm-chart/kuberay-operator/values.yaml        | 2 +-
 helm-chart/ray-cluster/Chart.yaml              | 3 +--
 manifests/base/kustomization.yaml              | 4 ++--
 ray-operator/config/default/kustomization.yaml | 2 +-
 7 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/helm-chart/kuberay-apiserver/Chart.yaml b/helm-chart/kuberay-apiserver/Chart.yaml
index 8ed8424fef..33fbbfb630 100644
--- a/helm-chart/kuberay-apiserver/Chart.yaml
+++ b/helm-chart/kuberay-apiserver/Chart.yaml
@@ -15,10 +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.4.0-rc.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: 0.4.0-rc.0
+version: 0.4.0
diff --git a/helm-chart/kuberay-apiserver/values.yaml b/helm-chart/kuberay-apiserver/values.yaml
index 7cb03532ae..c7e1695578 100644
--- 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: v0.4.0-rc.0
+  tag: v0.4.0
   pullPolicy: IfNotPresent
 
 ## Install Default RBAC roles and bindings
diff --git a/helm-chart/kuberay-operator/Chart.yaml b/helm-chart/kuberay-operator/Chart.yaml
index d642f456d4..f80859f79f 100644
--- a/helm-chart/kuberay-operator/Chart.yaml
+++ b/helm-chart/kuberay-operator/Chart.yaml
@@ -1,7 +1,6 @@
 apiVersion: v2
-appVersion: 0.4.0-rc.0
 description: A Helm chart for Kubernetes
 name: kuberay-operator
-version: 0.4.0-rc.0
+version: 0.4.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/values.yaml b/helm-chart/kuberay-operator/values.yaml
index aa15313e4c..74e13dbb1c 100644
--- a/helm-chart/kuberay-operator/values.yaml
+++ b/helm-chart/kuberay-operator/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: kuberay/operator
-  tag: v0.4.0-rc.0
+  tag: v0.4.0
   pullPolicy: IfNotPresent
 
 nameOverride: "kuberay-operator"
diff --git a/helm-chart/ray-cluster/Chart.yaml b/helm-chart/ray-cluster/Chart.yaml
index 6700ecac48..6edc2840c0 100644
--- a/helm-chart/ray-cluster/Chart.yaml
+++ b/helm-chart/ray-cluster/Chart.yaml
@@ -1,6 +1,5 @@
 apiVersion: v1
-appVersion: 0.4.0-rc.0
 description: A Helm chart for Kubernetes
 name: ray-cluster
-version: 0.4.0-rc.0
+version: 0.4.0
 icon: https://github.com/ray-project/ray/raw/master/doc/source/images/ray_header_logo.png
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 8cf287ccd5..a2aca54935 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -11,8 +11,8 @@ resources:
 images:
 - name: kuberay/apiserver
   newName: kuberay/apiserver
-  newTag: v0.4.0-rc.0
+  newTag: v0.4.0
 - name: kuberay/operator
   newName: kuberay/operator
-  newTag: v0.4.0-rc.0
+  newTag: v0.4.0
 
diff --git a/ray-operator/config/default/kustomization.yaml b/ray-operator/config/default/kustomization.yaml
index 9a555032d6..db5c8b219a 100644
--- a/ray-operator/config/default/kustomization.yaml
+++ b/ray-operator/config/default/kustomization.yaml
@@ -23,5 +23,5 @@ bases:
 images:
 - name: kuberay/operator
   newName: kuberay/operator
-  newTag: v0.4.0-rc.0
+  newTag: v0.4.0