Merge pull request #1350 from erikwilson/enforce-tag-version-match

scripts/test-helpers

@@ -189,12 +189,11 @@ sonobuoy-test() {
         return 0
     fi
     echo 'Starting sonobuoy tests'
-    local conformanceVersion=$(sed -e 's/[-+].*$//g' <<< "$VERSION_K8S")
 
     sonobuoy run \
         --config=scripts/sonobuoy-config.json \
         --plugin-env=e2e.E2E_USE_GO_RUNNER=true \
-        --kube-conformance-image-version=${conformanceVersion} \
+        --kube-conformance-image-version=${VERSION_K8S} \
         --wait=30 \
         $@ &
 

scripts/version.sh

@@ -26,7 +26,7 @@ if [ -z "$VERSION_CRICTL" ]; then
     VERSION_CRICTL="v0.0.0"
 fi
 
-VERSION_K8S=$(grep k8s.io/kubernetes go.mod | head -n1 | awk '{print $4}')
+VERSION_K8S=$(grep k8s.io/kubernetes go.mod | head -n1 | awk '{print $4}' | sed -e 's/[-+].*//')
 if [ -z "$VERSION_K8S" ]; then
     VERSION_K8S="v0.0.0"
 fi
@@ -34,8 +34,12 @@ fi
 VERSION_CNIPLUGINS="v0.7.6-k3s1"
 
 if [[ -n "$GIT_TAG" ]]; then
+    if [[ ! "$GIT_TAG" =~ ^"$VERSION_K8S"[+-] ]]; then
+        echo "Tagged version '$GIT_TAG' does not match expected version '$VERSION_K8S[+-]*'" >&2
+        exit 1
+    fi
     VERSION=$GIT_TAG
 else
-    VERSION="$(sed -e 's/[-+].*//' <<< "$VERSION_K8S")+${COMMIT:0:8}$DIRTY"
+    VERSION="$VERSION_K8S+${COMMIT:0:8}$DIRTY"
 fi
 VERSION_TAG="$(sed -e 's/+/-/g' <<< "$VERSION")"