build-sys: Have the chart Git tags be chart/vX.Y.Z, not chart-vX.Y.Z

Signed-off-by: Luke Shumaker <[email protected]>
emissary-ingress · Feb 24, 2022 · 5724f7e · 5724f7e
1 parent 074d0b9
commit 5724f7e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -580,7 +580,7 @@ commands:
         command: |
           thisversion=$(grep version: charts/ambassador/Chart.yaml | awk ' { print $2 }')
 
-          if [[ "<< pipeline.git.tag >>" != "chart-v${thisversion}" ]]; then
+          if [[ "<< pipeline.git.tag >>" != "chart/v${thisversion}" ]]; then
             echo "Chart version ${thisversion} doesn't match tag << pipeline.git.tag >>; aborting"
             exit 1
           fi

diff --git a/.circleci/config.yml.d/amb_util.yml b/.circleci/config.yml.d/amb_util.yml
@@ -263,7 +263,7 @@ commands:
           command: |
             thisversion=$(grep version: charts/ambassador/Chart.yaml | awk ' { print $2 }')
 
-            if [[ "<< pipeline.git.tag >>" != "chart-v${thisversion}" ]]; then
+            if [[ "<< pipeline.git.tag >>" != "chart/v${thisversion}" ]]; then
               echo "Chart version ${thisversion} doesn't match tag << pipeline.git.tag >>; aborting"
               exit 1
             fi
diff --git a/charts/charts.mk b/charts/charts.mk
@@ -72,7 +72,7 @@ release/chart/tag:
 			exit 1 ;\
 		fi; \
 		chart_ver=`grep 'version:' $(AMBASSADOR_CHART)/Chart.yaml | awk ' { print $$2 }'` ; \
-		chart_ver=chart-v$${chart_ver} ; \
+		chart_ver=chart/v$${chart_ver} ; \
 		git tag -m "Tagging $${chart_ver}" -a $${chart_ver} ; \
 		git push origin $${chart_ver} ; \
 	}

diff --git a/charts/scripts/common.sh b/charts/scripts/common.sh
@@ -143,7 +143,7 @@ create_chart_release() {
     if [[ -z "${GH_TOKEN}" ]] ; then
         gh auth login
     fi
-    tag="chart-v${1}"
+    tag="chart/v${1}"
     chart_version=${1}
     chart_dir=$2
     export CHART_VERSION=$1

diff --git a/charts/scripts/create_gh_release.sh b/charts/scripts/create_gh_release.sh
@@ -24,7 +24,7 @@ if ! command -v gh 2> /dev/null ; then
     exit 1
 fi
 thisversion=$(grep version ${chart_dir}/Chart.yaml | awk '{ print $2 }')
-chart_version=chart-v${thisversion}
+chart_version=chart/v${thisversion}
 git fetch
 
 if ! git rev-parse ${chart_version} >/dev/null 2>&1 ; then

diff --git a/charts/scripts/push_chart.sh b/charts/scripts/push_chart.sh
@@ -89,7 +89,7 @@ if [[ $thisversion =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && [[ -n "${PUBLISH_GIT_RELEAS
         echo "GH_RELEASE_TOKEN not set"
         exit 1
     fi
-    tag="chart-v${thisversion}"
+    tag="chart/v${thisversion}"
     export CHART_VERSION=${thisversion}
     title=`envsubst < ${chart_dir}/RELEASE_TITLE.tpl`
     repo_full_name="emissary-ingress/emissary"