From 30c6df8efcc12e34e8d297b1706fc0ee5c84ecbc Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 6 Aug 2020 11:18:31 -0700 Subject: [PATCH] build: update from Go 1.14.6 to Go 1.14.7 Go 1.14.7 fixes CVE-2020-16845 which is not believed to impact Nomad. --- .circleci/config.yml | 28 ++++++++++++++-------------- .circleci/config/config.yml | 8 ++++---- CHANGELOG.md | 1 + README.md | 2 +- scripts/release/mac-remote-build | 2 +- scripts/vagrant-linux-priv-go.sh | 2 +- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9cdec658620d..0b6589fc12e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -128,7 +128,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -246,7 +246,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -364,7 +364,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -574,7 +574,7 @@ jobs: path: c:\tmp\test-reports environment: - GOBIN: c:\gopath\bin - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOPATH: c:\gopath - GOTESTSUM_PATH: c:\tmp\test-reports - GOTESTSUM_VERSION: 0.4.2 @@ -587,7 +587,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -732,7 +732,7 @@ jobs: path: /tmp/test-reports lint-go: docker: - - image: golang:1.14.6 + - image: golang:1.14.7 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -798,7 +798,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -912,7 +912,7 @@ jobs: path: /tmp/test-reports test-devices: docker: - - image: golang:1.14.6 + - image: golang:1.14.7 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -1041,7 +1041,7 @@ jobs: path: pkg/darwin_amd64.zip environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /Users/distiller/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -1070,7 +1070,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json @@ -1184,7 +1184,7 @@ jobs: path: /tmp/test-reports build-binaries: docker: - - image: golang:1.14.6 + - image: golang:1.14.7 working_directory: /go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat @@ -1218,7 +1218,7 @@ jobs: path: pkg/linux_amd64.zip test-e2e: docker: - - image: golang:1.14.6 + - image: golang:1.14.7 working_directory: /go/src/github.com/hashicorp/nomad steps: - checkout @@ -1250,7 +1250,7 @@ jobs: working_directory: ~/go/src/github.com/hashicorp/nomad environment: - GIT_PAGER: cat - - GOLANG_VERSION: 1.14.6 + - GOLANG_VERSION: 1.14.7 - GOMAXPROCS: 1 - GOPATH: /home/circleci/go - GOTESTSUM_JSONFILE: /tmp/test-reports/testjsonfile.json diff --git a/.circleci/config/config.yml b/.circleci/config/config.yml index b891e4ff679b..ebfbbef18f4a 100644 --- a/.circleci/config/config.yml +++ b/.circleci/config/config.yml @@ -24,7 +24,7 @@ executors: go: working_directory: /go/src/github.com/hashicorp/nomad docker: - - image: golang:1.14.6 + - image: golang:1.14.7 environment: <<: *common_envs GOPATH: /go @@ -36,7 +36,7 @@ executors: environment: &machine_env <<: *common_envs GOPATH: /home/circleci/go - GOLANG_VERSION: 1.14.6 + GOLANG_VERSION: 1.14.7 # uses a more recent image with unattended upgrades disabled properly # but seems to break docker builds @@ -53,7 +53,7 @@ executors: environment: <<: *common_envs GOPATH: /Users/distiller/go - GOLANG_VERSION: 1.14.6 + GOLANG_VERSION: 1.14.7 go-windows: machine: @@ -65,6 +65,6 @@ executors: GOPATH: c:\gopath GOBIN: c:\gopath\bin GOTESTSUM_PATH: c:\tmp\test-reports - GOLANG_VERSION: 1.14.6 + GOLANG_VERSION: 1.14.7 GOTESTSUM_VERSION: 0.4.2 VAULT_VERSION: 1.4.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9993f7d38dea..0c14764ab8c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ BUG FIXES: * core: Fixed a bug where `nomad job plan` reports success and no updates if the job contains a scaling policy [[GH-8567](https://github.com/hashicorp/nomad/issues/8567)] * api: Added missing namespace field to scaling status GET response object [[GH-8530](https://github.com/hashicorp/nomad/issues/8530)] * api: Do not allow submission of jobs of type `system` that include task groups with scaling stanzas [[GH-8491](https://github.com/hashicorp/nomad/issues/8491)] + * build: Updated to Go 1.14.7. Go 1.14.6 contained a CVE that is not believed to impact Nomad [[GH-8601](https://github.com/hashicorp/nomad/issues/8601)] * vault: Fixed a bug where upgrades from pre-0.11.3 that use Vault can lead to memory spikes and write large Raft messages. [[GH-8553](https://github.com/hashicorp/nomad/issues/8553)] ## 0.12.1 (July 23, 2020) diff --git a/README.md b/README.md index 659d3a0bb39f..991ce2ac4cb2 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Who Uses Nomad Contributing to Nomad -------------------- -If you wish to contribute to Nomad, you will need [Go](https://www.golang.org) installed on your machine (version 1.14.6+ is *required*, and `gcc-go` is not supported). +If you wish to contribute to Nomad, you will need [Go](https://www.golang.org) installed on your machine (version 1.14.7+ is *required*, and `gcc-go` is not supported). See the [`contributing`](contributing/) directory for more developer documentation. diff --git a/scripts/release/mac-remote-build b/scripts/release/mac-remote-build index 67a275c8f46a..0761da7fb930 100755 --- a/scripts/release/mac-remote-build +++ b/scripts/release/mac-remote-build @@ -56,7 +56,7 @@ REPO_PATH="${TMP_WORKSPACE}/gopath/src/github.com/hashicorp/nomad" mkdir -p "${TMP_WORKSPACE}/tmp" install_go() { - local go_version="1.14.6" + local go_version="1.14.7" local download= download="https://storage.googleapis.com/golang/go${go_version}.darwin-amd64.tar.gz" diff --git a/scripts/vagrant-linux-priv-go.sh b/scripts/vagrant-linux-priv-go.sh index b4642dd4631b..2104687c3a73 100755 --- a/scripts/vagrant-linux-priv-go.sh +++ b/scripts/vagrant-linux-priv-go.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash function install_go() { - local go_version="1.14.6" + local go_version="1.14.7" local download= download="https://storage.googleapis.com/golang/go${go_version}.linux-amd64.tar.gz"