Skip to content

Commit b231062

Browse files
authored
Upgrade to go 1.21.9 (#5879)
* Upgrade to go 1.21.9 Signed-off-by: Friedrich Gonzalez <[email protected]> * Update changelog and workflows Signed-off-by: Friedrich Gonzalez <[email protected]> * Not use minor version for now. Needs more investigation Signed-off-by: Friedrich Gonzalez <[email protected]> * Update image again Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: Friedrich Gonzalez <[email protected]>
1 parent 9c8b9b7 commit b231062

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
lint:
1212
runs-on: ubuntu-20.04
1313
container:
14-
image: quay.io/cortexproject/build-image:PR5765-0ff811969
14+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
1515
steps:
1616
- name: Checkout Repo
1717
uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
4040
test:
4141
runs-on: ubuntu-20.04
4242
container:
43-
image: quay.io/cortexproject/build-image:PR5765-0ff811969
43+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
4444
steps:
4545
- name: Checkout Repo
4646
uses: actions/checkout@v2
@@ -83,7 +83,7 @@ jobs:
8383
build:
8484
runs-on: ubuntu-20.04
8585
container:
86-
image: quay.io/cortexproject/build-image:PR5765-0ff811969
86+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
8787
steps:
8888
- name: Checkout Repo
8989
uses: actions/checkout@v2
@@ -214,14 +214,14 @@ jobs:
214214
run: |
215215
touch build-image/.uptodate
216216
MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
217-
make BUILD_IMAGE=quay.io/cortexproject/build-image:PR5765-0ff811969 TTY='' configs-integration-test
217+
make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 TTY='' configs-integration-test
218218
219219
deploy_website:
220220
needs: [build, test]
221221
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
222222
runs-on: ubuntu-20.04
223223
container:
224-
image: quay.io/cortexproject/build-image:PR5765-0ff811969
224+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
225225
steps:
226226
- name: Checkout Repo
227227
uses: actions/checkout@v2
@@ -263,7 +263,7 @@ jobs:
263263
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
264264
runs-on: ubuntu-20.04
265265
container:
266-
image: quay.io/cortexproject/build-image:PR5765-0ff811969
266+
image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16
267267
steps:
268268
- name: Checkout Repo
269269
uses: actions/checkout@v2

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* [ENHANCEMENT] Logging: Added new options for logging HTTP request headers: `-server.log-request-headers` enables logging HTTP request headers, `-server.log-request-headers-exclude-list` allows users to specify headers which should not be logged. #5744
3030
* [ENHANCEMENT] Query Frontend/Scheduler: Time check in query priority now considers overall data select time window (including range selectors, modifiers and lookback delta). #5758
3131
* [ENHANCEMENT] Querier: Added `querier.store-gateway-query-stats-enabled` to enable or disable store gateway query stats log. #5749
32-
* [ENHANCEMENT] Upgrade to go 1.21.6. #5765
32+
* [ENHANCEMENT] Upgrade to go 1.21.9 #5765 #5879
3333
* [ENHANCEMENT] AlertManager: Retrying AlertManager Delete Silence on error #5794
3434
* [ENHANCEMENT] Ingester: Add new ingester metric `cortex_ingester_max_inflight_query_requests`. #5798
3535
* [ENHANCEMENT] Query: Added `query_storage_wall_time` to Query Frontend and Ruler query stats log for wall time spent on fetching data from storage. Query evaluation is not included. #5799

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ build-image/$(UPTODATE): build-image/*
122122
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
123123
BUILD_IN_CONTAINER := true
124124
BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
125-
LATEST_BUILD_IMAGE_TAG ?= update-go-1.21.3-e38685e50
125+
LATEST_BUILD_IMAGE_TAG ?= upgrade-go-to-1.21.9-b37062f16
126126

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

build-image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21.6-bullseye
1+
FROM golang:1.21.9-bullseye
22
ARG goproxyValue
33
ENV GOPROXY=${goproxyValue}
44
RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \

0 commit comments

Comments
 (0)