From f917e084d4a5596565b5debd659db0d4a5f9da6d Mon Sep 17 00:00:00 2001 From: Jon Kartago Lamida Date: Wed, 3 May 2023 17:25:52 +0800 Subject: [PATCH] Update Go to 1.20.4 (#4902) (#4904) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Go to 1.20.4 (#4902) * Update Go to 1.20.4. * CHANGELOG.md * Update build image. Signed-off-by: Peter Štibraný (cherry picked from commit ad3cb5578281a2b0ab4cde716afca62b41ecab62) * Update changelog for go security update Signed-off-by: Jon Kartago Lamida --------- Signed-off-by: Jon Kartago Lamida Co-authored-by: Peter Štibraný --- .github/workflows/compare-helm-with-jsonnet.yml | 2 +- .github/workflows/helm-ci.yml | 2 +- .github/workflows/test-build-deploy.yml | 14 +++++++------- CHANGELOG.md | 2 +- Makefile | 2 +- .../mimir-microservices-mode/dev.dockerfile | 2 +- development/mimir-read-write-mode/dev.dockerfile | 2 +- mimir-build-image/Dockerfile | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/compare-helm-with-jsonnet.yml b/.github/workflows/compare-helm-with-jsonnet.yml index 3489d4d103..ba858a8f32 100644 --- a/.github/workflows/compare-helm-with-jsonnet.yml +++ b/.github/workflows/compare-helm-with-jsonnet.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: '1.20.3' + go-version: '1.20.4' - uses: helm/kind-action@v1.2.0 - name: Download yq uses: dsaltares/fetch-gh-release-asset@d9376dacd30fd38f49238586cd2e9295a8307f4c diff --git a/.github/workflows/helm-ci.yml b/.github/workflows/helm-ci.yml index 525a372813..0e89cdf95d 100644 --- a/.github/workflows/helm-ci.yml +++ b/.github/workflows/helm-ci.yml @@ -18,7 +18,7 @@ jobs: conftest: runs-on: ubuntu-latest container: - image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01 + image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0 steps: - name: Check out repository uses: actions/checkout@v3 diff --git a/.github/workflows/test-build-deploy.yml b/.github/workflows/test-build-deploy.yml index 28eb35ebd0..ed3dd1875e 100644 --- a/.github/workflows/test-build-deploy.yml +++ b/.github/workflows/test-build-deploy.yml @@ -20,7 +20,7 @@ jobs: lint: runs-on: ubuntu-latest container: - image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01 + image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0 steps: - name: Check out repository uses: actions/checkout@v3 @@ -64,7 +64,7 @@ jobs: lint-jsonnet: runs-on: ubuntu-latest container: - image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01 + image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0 steps: - name: Check out repository uses: actions/checkout@v3 @@ -90,7 +90,7 @@ jobs: lint-helm: runs-on: ubuntu-latest container: - image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01 + image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0 steps: - name: Check out repository uses: actions/checkout@v3 @@ -119,7 +119,7 @@ jobs: test_group_id: [0, 1, 2, 3] test_group_total: [4] container: - image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01 + image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0 steps: - name: Check out repository uses: actions/checkout@v3 @@ -154,7 +154,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01 + image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0 steps: - name: Check out repository uses: actions/checkout@v3 @@ -198,7 +198,7 @@ jobs: - name: Upgrade golang uses: actions/setup-go@v3 with: - go-version: 1.20.3 + go-version: 1.20.4 - name: Check out repository uses: actions/checkout@v3 - name: Run Git Config @@ -244,7 +244,7 @@ jobs: if: (startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/r') ) && github.event_name == 'push' && github.repository == 'grafana/mimir' runs-on: ubuntu-latest container: - image: grafana/mimir-build-image:chore-upgrade-go-1203-5c4c29f01 + image: grafana/mimir-build-image:update-go-to-1.20.4-3f4099fd0 steps: - name: Check out repository uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a2089517..0d9cc06f48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -89,7 +89,6 @@ * [ENHANCEMENT] Querier: Cache the converted float histogram from chunk iterator, hence there is no need to lookup chunk every time to get the converted float histogram. #4684 * [ENHANCEMENT] Ruler: Improve rule upload performance when not enforcing per-tenant rule group limits. #4828 * [ENHANCEMENT] Improved memory limit on the in-memory cache used for regular expression matchers. #4751 -* [ENHANCEMENT] Go: update to 1.20.3. #4773 * [BUGFIX] Querier: Streaming remote read will now continue to return multiple chunks per frame after the first frame. #4423 * [BUGFIX] Store-gateway: the values for `stage="processed"` for the metrics `cortex_bucket_store_series_data_touched` and `cortex_bucket_store_series_data_size_touched_bytes` when using fine-grained chunks caching is now reporting the correct values of chunks held in memory. #4449 * [BUGFIX] Compactor: fixed reporting a compaction error when compactor is correctly shut down while populating blocks. #4580 @@ -102,6 +101,7 @@ * [BUGFIX] Ring status page: fixed the owned tokens percentage value displayed. #4730 * [BUGFIX] Querier: fixed chunk iterator that can return sample with wrong timestamp. #4450 * [BUGFIX] Packaging: fix preremove script preventing upgrades. #4801 +* [BUGFIX] Security: updates Go to version 1.20.4 to fix CVE-2023-24539, CVE-2023-24540, CVE-2023-29400. #4903 ### Mixin diff --git a/Makefile b/Makefile index 941b5c4853..b0fbc4dc1f 100644 --- a/Makefile +++ b/Makefile @@ -178,7 +178,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/* # All the boiler plate for building golang follows: SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E") BUILD_IN_CONTAINER ?= true -LATEST_BUILD_IMAGE_TAG ?= chore-upgrade-go-1203-5c4c29f01 +LATEST_BUILD_IMAGE_TAG ?= update-go-to-1.20.4-3f4099fd0 # TTY is parameterized to allow Google Cloud Builder to run builds, # as it currently disallows TTY devices. This value needs to be overridden diff --git a/development/mimir-microservices-mode/dev.dockerfile b/development/mimir-microservices-mode/dev.dockerfile index 3c29745e62..b83e39c42b 100644 --- a/development/mimir-microservices-mode/dev.dockerfile +++ b/development/mimir-microservices-mode/dev.dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.3 +FROM golang:1.20.4 ENV CGO_ENABLED=0 RUN go install github.com/go-delve/delve/cmd/dlv@v1.9.1 diff --git a/development/mimir-read-write-mode/dev.dockerfile b/development/mimir-read-write-mode/dev.dockerfile index ad6fc4412e..25a63cf28c 100644 --- a/development/mimir-read-write-mode/dev.dockerfile +++ b/development/mimir-read-write-mode/dev.dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.3 +FROM golang:1.20.4 ENV CGO_ENABLED=0 RUN go install github.com/go-delve/delve/cmd/dlv@v1.7.3 diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile index c0902f1bd7..feab0dc91c 100644 --- a/mimir-build-image/Dockerfile +++ b/mimir-build-image/Dockerfile @@ -5,7 +5,7 @@ FROM k8s.gcr.io/kustomize/kustomize:v4.5.5 as kustomize FROM alpine/helm:3.11.1 as helm -FROM golang:1.20.3-bullseye +FROM golang:1.20.4-bullseye ARG goproxyValue ENV GOPROXY=${goproxyValue} ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"