diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 28a8956cc05..227bfb8b1b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: - name: Install Go uses: actions/setup-go@v1 with: - go-version: 1.15 + go-version: 1.16 - name: Install golangci-lint run: > cd /tmp && @@ -33,7 +33,7 @@ jobs: test: strategy: matrix: - go-versions: [1.15, 1.14] + go-versions: [1.16, 1.15] platform: [ubuntu-20.04] environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh] runs-on: ${{ matrix.platform }} @@ -54,7 +54,7 @@ jobs: test-integration: strategy: matrix: - go-versions: [1.15, 1.14] + go-versions: [1.16, 1.15] platform: [ubuntu-20.04] environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh] runs-on: ${{ matrix.platform }} diff --git a/Makefile b/Makefile index 92ee27fbade..ec9980c144f 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ docker-%: @docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile$(Dockerfile_tag) . docker-build: - @docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.15 make build + @docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.16 make build presubmit: vet @echo ">> checking go formatting" diff --git a/build/integration-in-docker.sh b/build/integration-in-docker.sh index 4083de1a555..fb7242e9e4b 100755 --- a/build/integration-in-docker.sh +++ b/build/integration-in-docker.sh @@ -70,5 +70,5 @@ GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"} PACKAGES=${PACKAGES:-"sudo"} BUILD_PACKAGES=${BUILD_PACKAGES:-} CADVISOR_ARGS=${CADVISOR_ARGS:-} -GOLANG_VERSION=${GOLANG_VERSION:-"1.15"} +GOLANG_VERSION=${GOLANG_VERSION:-"1.16"} run_tests "$GO_FLAGS" "$PACKAGES" "$BUILD_PACKAGES" "$CADVISOR_ARGS" diff --git a/build/unit-in-container.sh b/build/unit-in-container.sh index bc88407b212..924d1425016 100755 --- a/build/unit-in-container.sh +++ b/build/unit-in-container.sh @@ -44,5 +44,5 @@ function run_tests() { GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"} BUILD_PACKAGES=${BUILD_PACKAGES:-} -GOLANG_VERSION=${GOLANG_VERSION:-"1.15"} +GOLANG_VERSION=${GOLANG_VERSION:-"1.16"} run_tests diff --git a/deploy/canary/Dockerfile b/deploy/canary/Dockerfile index 3b206e61bad..2319ff6b533 100644 --- a/deploy/canary/Dockerfile +++ b/deploy/canary/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15 +FROM golang:1.16 MAINTAINER dashpole@google.com RUN apt-get update && apt-get install -y git dmsetup && apt-get clean