Merge pull request #1055 from erikwilson/bump-go-1.13

Bump go to 1.13.4

Dockerfile.dapper

@@ -1,4 +1,4 @@
-FROM golang:1.12.12-alpine3.10
+FROM golang:1.13.4-alpine3.10
 
 RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers zlib-dev tar zip squashfs-tools npm coreutils \
     python3 py3-pip python3-dev openssl-dev libffi-dev libseccomp libseccomp-dev make libuv-static

Dockerfile.sonobuoy.dapper

@@ -1,4 +1,4 @@
-FROM golang:1.13.3-alpine3.10
+FROM golang:1.13.4-alpine3.10
 
 RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python2
 RUN SONOBUOY_VER=v0.16.2 && \

scripts/build

@@ -1,18 +1,18 @@
 #!/bin/bash
 set -e -x
 
-source $(dirname $0)/version.sh
-
 cd $(dirname $0)/..
+
+. ./scripts/version.sh
+
 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
 
+export GO111MODULE=off
+
+VENDOR_PREFIX="${PKG}/vendor/"
 VERSIONFLAGS="
     -X ${PKG}/pkg/version.Version=${VERSION}
     -X ${PKG}/pkg/version.GitCommit=${COMMIT:0:8}

scripts/download

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-source $(dirname $0)/version.sh
-
 cd $(dirname $0)/..
 
+. ./scripts/version.sh
+
 ROOT_VERSION=v0.3.0
 TRAEFIK_VERSION=1.77.1
 CHARTS_DIR=build/static/charts

scripts/package-airgap

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -e -x
 
-source $(dirname $0)/version.sh
-
 cd $(dirname $0)/..
 
+. ./scripts/version.sh
+
 images=$(cat scripts/airgap/image-list.txt)
 xargs -n1 docker pull <<< "${images}"
 docker save ${images} -o dist/artifacts/k3s-airgap-images-${ARCH}.tar 

scripts/package-cli

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -e -x
 
-source $(dirname $0)/version.sh
-
 cd $(dirname $0)/..
 
+. ./scripts/version.sh
+
 rm -rf bin/crictl bin/kubectl bin/k3s-agent bin/k3s-server bin/kubectl bin/k3s build/data
 ln -s containerd bin/k3s-agent
 ln -s containerd bin/k3s-server

scripts/package-image

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -e
 
-source $(dirname $0)/version.sh
-
 cd $(dirname $0)/..
 
+. ./scripts/version.sh
+
 TAG=${TAG:-${VERSION}${SUFFIX}}
 REPO=${REPO:-rancher}
 IMAGE_NAME=${IMAGE_NAME:-k3s}

scripts/sonobuoy-e2e-tests

@@ -4,7 +4,7 @@ set -e -x
 cd $(dirname $0)/..
 
 if [ -z "$K3S_IMAGE" ]; then
-    source $(dirname $0)/version.sh
+    . ./scripts/version.sh
     TAG=${TAG:-${VERSION}${SUFFIX}}
     REPO=${REPO:-rancher}
     IMAGE_NAME=${IMAGE_NAME:-k3s}

scripts/test-helpers

@@ -128,7 +128,7 @@ retrieve-sonobuoy-logs() {
     if [ -n "${E2E_LOG_OUTPUT}" ]; then
         cp ${RESULTS} $(sed -e "s/-STATUS-/-${status}-/g" <<< "${E2E_LOG_OUTPUT}")
     fi
-    awk '/^Summarizing .* Failures:$/,0' ${RESULTS}
+    awk '/^Summarizing .* Failures?:$/,0' ${RESULTS}
     return ${exit_code}
 }
 export -f retrieve-sonobuoy-logs

scripts/version.sh

@@ -16,8 +16,8 @@ fi
 ARCH=$(go env GOARCH)
 SUFFIX="-${ARCH}"
 
-VERSION_CONTAINERD=$(grep github.com/containerd/containerd $(dirname $0)/../go.mod | head -n1 | awk '{print $4}')
+VERSION_CONTAINERD=$(grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}')
-VERSION_CRICTL=$(grep github.com/kubernetes-sigs/cri-tools $(dirname $0)/../go.mod | head -n1 | awk '{print $4}')
+VERSION_CRICTL=$(grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}')
 
 if [ -z "$VERSION_CONTAINERD" ]; then
     VERSION_CONTAINERD="v0.0.0"