From 9cf744f5013ff52cda3314ed0e441dda9f023546 Mon Sep 17 00:00:00 2001
From: ahg-g <ahg@google.com>
Date: Thu, 20 Mar 2025 06:42:31 +0000
Subject: [PATCH] Tag the main version of the helm chart with v0 (i.e., latest
 dev version)

---
 cloudbuild.yaml    | 1 -
 hack/push-chart.sh | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 201d74ce1..82c594c60 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -25,7 +25,6 @@ steps:
     args:
       - inferencepool-helm-chart-push
     env:
-    - GIT_TAG=$_GIT_TAG
     - EXTRA_TAG=$_PULL_BASE_REF
     - GOTOOLCHAIN=auto
   - name: gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20240718-5ef92b5c36
diff --git a/hack/push-chart.sh b/hack/push-chart.sh
index a7a497a2c..e1cbbb1f8 100755
--- a/hack/push-chart.sh
+++ b/hack/push-chart.sh
@@ -21,7 +21,7 @@ set -o pipefail
 DEST_CHART_DIR=${DEST_CHART_DIR:-bin/}
 
 EXTRA_TAG=${EXTRA_TAG:-$(git branch --show-current)} 
-GIT_TAG=${GIT_TAG:-$(git tag | sort | grep -v rc | tail -n1)-$(git describe --tags --dirty --always)}
+CHART_VERSION=${CHART_VERSION:-"v0"}
 
 STAGING_IMAGE_REGISTRY=${STAGING_IMAGE_REGISTRY:-us-central1-docker.pkg.dev/k8s-staging-images}
 IMAGE_REGISTRY=${IMAGE_REGISTRY:-${STAGING_IMAGE_REGISTRY}/gateway-api-inference-extension}
@@ -32,9 +32,10 @@ HELM=${HELM:-./bin/helm}
 
 readonly semver_regex='^v([0-9]+)(\.[0-9]+){1,2}$'
 
-chart_version=${GIT_TAG}
+chart_version=${CHART_VERSION}
 if [[ ${EXTRA_TAG} =~ ${semver_regex} ]]
 then
+  # This is a release branch, use the release version
   ${YQ} -i '.inferenceExtension.image.tag=strenv(EXTRA_TAG)' config/charts/inferencepool/values.yaml
   chart_version=${EXTRA_TAG}
 fi