Merge pull request #281 from YunShiHang/main

Fix temporary version tag issues

Author: ErikJiang

.github/workflows/auto-pr-ci.yaml

@@ -144,7 +144,11 @@ jobs:
       - name: e2e
         run: |
           CONTAINER_TAG=$(git describe --tags --abbrev=8 --dirty)
-          HELM_CHART_VERSION=`echo ${CONTAINER_TAG}|awk -F "-" '{print $1 }'`
+          HELM_CHART_VERSION=`echo ${CONTAINER_TAG}|awk -F "-" '{print $1}'`
+          CONDITION_COUNT=$(echo ${CONTAINER_TAG}|grep -o '-'|wc -l)
+          if (( ${CONDITION_COUNT} >= 3 ));then
+              HELM_CHART_VERSION=`echo ${CONTAINER_TAG}|awk -F "-" '{print $1"-"$2 }'`
+          fi
           echo ${{ runner.name }}
           echo ${{ runner.os }}
           echo ${{ runner.arch }}

hack/deploy.sh

@@ -49,7 +49,8 @@ if [ "${IMG_VER}" != "" ]; then
 fi
 
 #v0.1.1 --> 0.1.1 Match the helm chart version specification, remove the preceding prefix `v` character
-KUBEAN_CHART_VERSION="$(echo "${HELM_VER}" |sed  's/^v//g' )"
+# KUBEAN_CHART_VERSION="$(echo "${HELM_VER}" |sed  's/^v//g' )"
+KUBEAN_CHART_VERSION=${HELM_VER}
 
 #ensure kube.conf without group-readable
 chmod 600 ${KUBE_CONF}