Skip to content

Commit 674359d

Browse files
authored
[1.12 branch] Update Go to 1.17.8 (#4658)
* Update Go to 1.17.8 Pulls in: go1.17.6 (released 2022-01-06) includes fixes to the compiler, linker, runtime, and the crypto/x509, net/http, and reflect packages. [details](https://github.com/golang/go/issues?q=milestone%3AGo1.17.6+label%3ACherryPickApproved) go1.17.7 (released 2022-02-10) includes security fixes to the crypto/elliptic, math/big packages and to the go command, as well as bug fixes to the compiler, linker, runtime, the go command, and the debug/macho, debug/pe, and net/http/httptest packages. [details](https://github.com/golang/go/issues?q=milestone%3AGo1.17.7+label%3ACherryPickApproved) go1.17.8 (released 2022-03-03) includes a security fix to the regexp/syntax package, as well as bug fixes to the compiler, runtime, the go command, and the crypto/x509, and net packages. [details](https://github.com/golang/go/issues?q=milestone%3AGo1.17.8+label%3ACherryPickApproved) Signed-off-by: Bryan Boreham <[email protected]>
1 parent fc862f9 commit 674359d

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/test-build-deploy.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
lint:
1111
runs-on: ubuntu-20.04
1212
container:
13-
image: quay.io/cortexproject/build-image:master-f0c5aab05
13+
image: quay.io/cortexproject/build-image:update-go-1-17-8-6aed4de76
1414
steps:
1515
- name: Checkout Repo
1616
uses: actions/checkout@v2
@@ -34,7 +34,7 @@ jobs:
3434
test:
3535
runs-on: ubuntu-20.04
3636
container:
37-
image: quay.io/cortexproject/build-image:master-f0c5aab05
37+
image: quay.io/cortexproject/build-image:update-go-1-17-8-6aed4de76
3838
services:
3939
cassandra:
4040
image: cassandra:3.11
@@ -55,7 +55,7 @@ jobs:
5555
build:
5656
runs-on: ubuntu-20.04
5757
container:
58-
image: quay.io/cortexproject/build-image:master-f0c5aab05
58+
image: quay.io/cortexproject/build-image:update-go-1-17-8-6aed4de76
5959
steps:
6060
- name: Checkout Repo
6161
uses: actions/checkout@v2
@@ -98,7 +98,7 @@ jobs:
9898
- name: Upgrade golang
9999
uses: actions/setup-go@v2
100100
with:
101-
go-version: 1.17.5
101+
go-version: 1.17.8
102102
- name: Checkout Repo
103103
uses: actions/checkout@v2
104104
- name: Install Docker Client
@@ -171,14 +171,14 @@ jobs:
171171
run: |
172172
touch build-image/.uptodate
173173
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
174-
make BUILD_IMAGE=quay.io/cortexproject/build-image:master-f0c5aab05 TTY='' configs-integration-test
174+
make BUILD_IMAGE=quay.io/cortexproject/build-image:update-go-1-17-8-6aed4de76 TTY='' configs-integration-test
175175
176176
deploy_website:
177177
needs: [build, test]
178178
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
179179
runs-on: ubuntu-20.04
180180
container:
181-
image: quay.io/cortexproject/build-image:master-f0c5aab05
181+
image: quay.io/cortexproject/build-image:update-go-1-17-8-6aed4de76
182182
steps:
183183
- name: Checkout Repo
184184
uses: actions/checkout@v2
@@ -215,7 +215,7 @@ jobs:
215215
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
216216
runs-on: ubuntu-20.04
217217
container:
218-
image: quay.io/cortexproject/build-image:master-f0c5aab05
218+
image: quay.io/cortexproject/build-image:update-go-1-17-8-6aed4de76
219219
steps:
220220
- name: Checkout Repo
221221
uses: actions/checkout@v2

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* [CHANGE] The `status_code` label on gRPC client metrics has changed from '200' and '500' to '2xx', '5xx', '4xx', 'cancel' or 'error'. 4601
1111
* [CHANGE] Memberlist: changed probe interval from `1s` to `5s` and probe timeout from `500ms` to `2s`. #4601
1212
* [FEATURE] Add shuffle sharding grouper and planner within compactor to allow further work towards parallelizing compaction #4624
13-
* [ENHANCEMENT] Update Go version to 1.17.5. #4602 #4604
13+
* [ENHANCEMENT] Update Go version to 1.17.8. #4602 #4604 #4658
1414
* [ENHANCEMENT] Keep track of discarded samples due to bad relabel configuration in `cortex_discarded_samples_total`. #4503
1515
* [ENHANCEMENT] Ruler: Add `-ruler.disable-rule-group-label` to disable the `rule_group` label on exported metrics. #4571
1616
* [ENHANCEMENT] Query federation: improve performance in MergeQueryable by memoizing labels. #4502

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ build-image/$(UPTODATE): build-image/*
119119
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
120120
BUILD_IN_CONTAINER := true
121121
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
122-
LATEST_BUILD_IMAGE_TAG ?= master-f0c5aab05
122+
LATEST_BUILD_IMAGE_TAG ?= update-go-1-17-8-6aed4de76
123123

124124
# TTY is parameterized to allow Google Cloud Builder to run builds,
125125
# as it currently disallows TTY devices. This value needs to be overridden

build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17.5-buster
1+
FROM golang:1.17.8-buster
22
ARG goproxyValue
33
ENV GOPROXY=${goproxyValue}
44
RUN apt-get update && apt-get install -y curl python-requests python-yaml file jq unzip protobuf-compiler libprotobuf-dev && \

0 commit comments

Comments
 (0)