Merge pull request #1000 from erikwilson/fix-versions-2

Fix ctr/crictl unknown version strings

scripts/build

@@ -8,13 +8,17 @@ PKG="github.com/rancher/k3s"
 PKG_CONTAINERD="github.com/containerd/containerd"
 PKG_RANCHER_CONTAINERD="github.com/rancher/containerd"
 PKG_CRICTL="github.com/kubernetes-sigs/cri-tools"
+VENDOR_PREFIX=
+if [ -z "$(go mod why 2>/dev/null)" ]; then
+    VENDOR_PREFIX="${PKG}/vendor/"
+fi
 
 VERSIONFLAGS="
-    -X $PKG/pkg/version.Version=$VERSION
-    -X $PKG/pkg/version.GitCommit=${COMMIT:0:8}
-    -X $PKG_CONTAINERD/version.Version=$VERSION_CONTAINERD
-    -X $PKG_CONTAINERD/version.Package=$PKG_RANCHER_CONTAINERD
-    -X $PKG_CRICTL/pkg/version.Version=$VERSION_CRICTL"
+    -X ${PKG}/pkg/version.Version=${VERSION}
+    -X ${PKG}/pkg/version.GitCommit=${COMMIT:0:8}
+    -X ${VENDOR_PREFIX}${PKG_CONTAINERD}/version.Version=${VERSION_CONTAINERD}
+    -X ${VENDOR_PREFIX}${PKG_CONTAINERD}/version.Package=${PKG_RANCHER_CONTAINERD}
+    -X ${VENDOR_PREFIX}${PKG_CRICTL}/pkg/version.Version=${VERSION_CRICTL}"
 LDFLAGS="
     -w -s"
 STATIC="

scripts/sonobuoy

@@ -87,6 +87,24 @@ export -f wait-for-services
 
 # ---
 
+verify-valid-version() {
+    if docker exec $@ 2>&1 | grep -iE '(dev|head|unknown|fail|refuse)'; then
+        return 1
+    fi
+}
+export -f verify-valid-version
+
+# ---
+
+verify-valid-versions() {
+    verify-valid-version $1 kubectl version
+    verify-valid-version $1 ctr version
+    verify-valid-version $1 crictl version
+}
+export -f verify-valid-versions
+
+# ---
+
 dump-container-logs() {
     mkdir -p ${LOGS}
     for container in ${CONTAINERS}; do
@@ -179,9 +197,10 @@ docker run -d --name ${K3S_SERVER} --privileged \
 K3S_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' ${K3S_SERVER})
 echo "Started ${K3S_SERVER} @ ${K3S_IP}:${K3S_PORT}"
 
-# ---
-
 timeout --foreground 1m bash -c wait-for-kubeconfig
+verify-valid-versions ${K3S_SERVER}
+
+# ---
 
 docker run -d --name ${K3S_AGENT} --privileged \
     -e K3S_CLUSTER_SECRET=${SECRET} \