From c118602ed2a76f7ad7e2c4f0c1578c39581d23e9 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez Date: Mon, 22 Apr 2024 18:42:06 +0200 Subject: [PATCH 1/4] Upgrade to go 1.21.9 Signed-off-by: Friedrich Gonzalez --- CHANGELOG.md | 2 +- build-image/Dockerfile | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15bbbd8351..8921383fea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ * [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 * [ENHANCEMENT] Query Frontend/Scheduler: Time check in query priority now considers overall data select time window (including range selectors, modifiers and lookback delta). #5758 * [ENHANCEMENT] Querier: Added `querier.store-gateway-query-stats-enabled` to enable or disable store gateway query stats log. #5749 -* [ENHANCEMENT] Upgrade to go 1.21.6. #5765 +* [ENHANCEMENT] Upgrade to go 1.21.9 #5765 * [ENHANCEMENT] AlertManager: Retrying AlertManager Delete Silence on error #5794 * [ENHANCEMENT] Ingester: Add new ingester metric `cortex_ingester_max_inflight_query_requests`. #5798 * [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 diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 95cbe04c18..93d49739ac 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6-bullseye +FROM golang:1.21.9-bullseye ARG goproxyValue ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl file jq unzip protobuf-compiler libprotobuf-dev && \ diff --git a/go.mod b/go.mod index 9353493893..7a604d357c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cortexproject/cortex -go 1.21 +go 1.21.9 require ( github.com/Masterminds/squirrel v1.5.4 From a88c1e7dee804d75120c243d5050ebd45b108739 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez Date: Mon, 22 Apr 2024 20:54:57 +0200 Subject: [PATCH 2/4] Update changelog and workflows Signed-off-by: Friedrich Gonzalez --- .github/workflows/test-build-deploy.yml | 12 ++++++------ CHANGELOG.md | 2 +- Makefile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index de979c63e3..c8ae550e23 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -11,7 +11,7 @@ jobs: lint: runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:PR5765-0ff811969 + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -40,7 +40,7 @@ jobs: test: runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:PR5765-0ff811969 + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -83,7 +83,7 @@ jobs: build: runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:PR5765-0ff811969 + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -214,14 +214,14 @@ jobs: run: | touch build-image/.uptodate MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations - make BUILD_IMAGE=quay.io/cortexproject/build-image:PR5765-0ff811969 TTY='' configs-integration-test + make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed 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-20.04 container: - image: quay.io/cortexproject/build-image:PR5765-0ff811969 + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -263,7 +263,7 @@ jobs: if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex' runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:PR5765-0ff811969 + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed steps: - name: Checkout Repo uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8921383fea..cd4be6f937 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ * [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 * [ENHANCEMENT] Query Frontend/Scheduler: Time check in query priority now considers overall data select time window (including range selectors, modifiers and lookback delta). #5758 * [ENHANCEMENT] Querier: Added `querier.store-gateway-query-stats-enabled` to enable or disable store gateway query stats log. #5749 -* [ENHANCEMENT] Upgrade to go 1.21.9 #5765 +* [ENHANCEMENT] Upgrade to go 1.21.9 #5765 #5879 * [ENHANCEMENT] AlertManager: Retrying AlertManager Delete Silence on error #5794 * [ENHANCEMENT] Ingester: Add new ingester metric `cortex_ingester_max_inflight_query_requests`. #5798 * [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 diff --git a/Makefile b/Makefile index 4804f6734d..9b6982a5ee 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,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 ?= update-go-1.21.3-e38685e50 +LATEST_BUILD_IMAGE_TAG ?= upgrade-go-to-1.21.9-c118602ed # TTY is parameterized to allow Google Cloud Builder to run builds, # as it currently disallows TTY devices. This value needs to be overridden From b37062f16be81d47f27cdf2f8537c104e7dced7b Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez Date: Mon, 22 Apr 2024 22:12:43 +0200 Subject: [PATCH 3/4] Not use minor version for now. Needs more investigation Signed-off-by: Friedrich Gonzalez --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7a604d357c..9353493893 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cortexproject/cortex -go 1.21.9 +go 1.21 require ( github.com/Masterminds/squirrel v1.5.4 From 179002b94958159d434e5d4385b9fd915baf54cc Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez Date: Mon, 22 Apr 2024 22:22:38 +0200 Subject: [PATCH 4/4] Update image again Signed-off-by: Friedrich Gonzalez --- .github/workflows/test-build-deploy.yml | 12 ++++++------ Makefile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index c8ae550e23..b0d2862b68 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -11,7 +11,7 @@ jobs: lint: runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -40,7 +40,7 @@ jobs: test: runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -83,7 +83,7 @@ jobs: build: runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -214,14 +214,14 @@ jobs: run: | touch build-image/.uptodate MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations - make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed TTY='' configs-integration-test + make BUILD_IMAGE=quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 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-20.04 container: - image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 steps: - name: Checkout Repo uses: actions/checkout@v2 @@ -263,7 +263,7 @@ jobs: if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex' runs-on: ubuntu-20.04 container: - image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-c118602ed + image: quay.io/cortexproject/build-image:upgrade-go-to-1.21.9-b37062f16 steps: - name: Checkout Repo uses: actions/checkout@v2 diff --git a/Makefile b/Makefile index 9b6982a5ee..e59ccfb501 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,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 ?= upgrade-go-to-1.21.9-c118602ed +LATEST_BUILD_IMAGE_TAG ?= upgrade-go-to-1.21.9-b37062f16 # TTY is parameterized to allow Google Cloud Builder to run builds, # as it currently disallows TTY devices. This value needs to be overridden