From cc20b677c42f52f79f68f656fb6f0a89301ce9f5 Mon Sep 17 00:00:00 2001 From: Justin Holcomb Date: Fri, 15 Aug 2025 18:20:23 -0600 Subject: [PATCH 1/2] Chore: use Go 1.24.6 build image --------- Signed-off-by: Justin Holcomb --- .github/workflows/test-build-deploy.yml | 14 +++++++------- Makefile | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index 80406f46e7..9d5fb1a20f 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -17,7 +17,7 @@ jobs: lint: runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-7ce1d1b12 + image: quay.io/cortexproject/build-image:master-59491e9aae steps: - name: Checkout Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -46,7 +46,7 @@ jobs: test: runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-7ce1d1b12 + image: quay.io/cortexproject/build-image:master-59491e9aae steps: - name: Checkout Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -64,7 +64,7 @@ jobs: test-no-race: runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-7ce1d1b12 + image: quay.io/cortexproject/build-image:master-59491e9aae steps: - name: Checkout Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -107,7 +107,7 @@ jobs: build: runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-7ce1d1b12 + image: quay.io/cortexproject/build-image:master-59491e9aae steps: - name: Checkout Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -247,14 +247,14 @@ jobs: run: | touch build-image/.uptodate MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations - make BUILD_IMAGE=quay.io/cortexproject/build-image:master-7ce1d1b12 TTY='' configs-integration-test + make BUILD_IMAGE=quay.io/cortexproject/build-image:master-59491e9aae TTY='' configs-integration-test deploy_website: needs: [build, test] if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex' runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-7ce1d1b12 + image: quay.io/cortexproject/build-image:master-59491e9aae steps: - name: Checkout Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -296,7 +296,7 @@ jobs: if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex' runs-on: ubuntu-24.04 container: - image: quay.io/cortexproject/build-image:master-7ce1d1b12 + image: quay.io/cortexproject/build-image:master-59491e9aae steps: - name: Checkout Repo uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/Makefile b/Makefile index 6115019e72..ae4f3ab7cc 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ build-image/$(UPTODATE): build-image/* SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E") BUILD_IN_CONTAINER := true BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image -LATEST_BUILD_IMAGE_TAG ?= master-7ce1d1b12 +LATEST_BUILD_IMAGE_TAG ?= master-59491e9aae # TTY is parameterized to allow Google Cloud Builder to run builds, # as it currently disallows TTY devices. This value needs to be overridden From 698820e17bca1125f9922ad4b3f5542a44833c0a Mon Sep 17 00:00:00 2001 From: Justin Holcomb Date: Fri, 15 Aug 2025 18:36:42 -0600 Subject: [PATCH 2/2] Doc: update CHANGELOG with Go 1.24.6 enhancement --------- Signed-off-by: Justin Holcomb --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec1979ef6f..6987b41ecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ * [ENHANCEMENT] Query Frontend: Add a `format_query` label value to the `op` label at `cortex_query_frontend_queries_total` metric. #6925 * [ENHANCEMENT] API: add request ID injection to context to enable tracking requests across downstream services. #6895 * [ENHANCEMENT] gRPC: Add gRPC Channelz monitoring. #6950 +* [ENHANCEMENT] Upgrade build image and Go version to 1.24.6. #6970 #6976 * [BUGFIX] Ingester: Avoid error or early throttling when READONLY ingesters are present in the ring #6517 * [BUGFIX] Ingester: Fix labelset data race condition. #6573 * [BUGFIX] Compactor: Cleaner should not put deletion marker for blocks with no-compact marker. #6576