NAS-116011 / 22.02.1 / Merge pull request #22 from truenas/fix-tag-issue-22

Fix version scheme issues for containerd

NAS-116011 / 22.02.1 / Merge pull request #22 from truenas/fix-tag-issue-22
Fix version scheme issues for containerd
937d546a · Rick Mesta · GitHub · 93e32a81 · c6ef8622 · 937d546a
Unverified Commit 937d546a authored 3 years ago by Rick Mesta Committed by GitHub 3 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 3 deletions
+5 -3
--- a/scripts/version.sh
+++ b/scripts/version.sh
@@ -8,9 +8,11 @@ TREE_STATE=clean
 COMMIT=$DRONE_COMMIT

 if [ -d .git ]; then
-    if [ -z "$GIT_TAG" ]; then
-        GIT_TAG=$(git tag -l --contains HEAD | head -n 1)
-    fi
+    # We comment out the version tag bit as our versioning scheme is not liked by containerd and it fails to start
+    # So we instead rely on the git commit hash to identify the k3s version running in the scale system
+    # if [ -z "$GIT_TAG" ]; then
+    #    GIT_TAG=$(git tag -l --contains HEAD | head -n 1)
+    # fi
    if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
        DIRTY="-dirty"
        TREE_STATE=dirty