Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Enforce that tag versions are prefixed with k8s go.mod version
This commit is contained in:
Erik Wilson 2020-01-24 11:21:39 -07:00 committed by GitHub
commit cdab19b09a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/test-helpers
View File

@ -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 \
$@ &

8
scripts/version.sh
View File

@ -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")"