Skip to content

Commit

Permalink
Update Go to 1.20.4 (#4902) (#4904)
Browse files Browse the repository at this point in the history
* Update Go to 1.20.4 (#4902)

* Update Go to 1.20.4.
* CHANGELOG.md
* Update build image.

Signed-off-by: Peter Štibraný <[email protected]>
(cherry picked from commit ad3cb55)

* Update changelog for go security update

Signed-off-by: Jon Kartago Lamida <[email protected]>

---------

Signed-off-by: Jon Kartago Lamida <[email protected]>
Co-authored-by: Peter Štibraný <[email protected]>
  • Loading branch information
lamida and pstibrany committed May 3, 2023
1 parent 4bb6a36 commit f917e08
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compare-helm-with-jsonnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Download yq
uses: dsaltares/fetch-gh-release-asset@d9376dacd30fd38f49238586cd2e9295a8307f4c
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test-build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion development/mimir-microservices-mode/dev.dockerfile
Original file line number Diff line number Diff line change
@@ -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/[email protected]

Expand Down
2 changes: 1 addition & 1 deletion development/mimir-read-write-mode/dev.dockerfile
Original file line number Diff line number Diff line change
@@ -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/[email protected]

Expand Down
2 changes: 1 addition & 1 deletion mimir-build-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit f917e08

Please sign in to comment.