diff --git a/.github/workflows/compare-helm-with-jsonnet.yml b/.github/workflows/compare-helm-with-jsonnet.yml index 3489d4d1038..ba858a8f32c 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 525a372813d..0e89cdf95d0 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 28eb35ebd09..ed3dd1875ee 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 1d1e0fd9098..8b4c4c7dff5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * [ENHANCEMENT] Querier: reduce CPU utilisation when shuffle sharding is enabled with large shard sizes. #4851 * [ENHANCEMENT] Packaging: facilitate configuration management by instructing systemd to start mimir with a configuration file. #4810 * [ENHANCEMENT] Store-gateway: reduce memory allocations when looking up postings from cache. #4861 #4869 +* [ENHANCEMENT] Go: update to 1.20.4. #4092 * [BUGFIX] Metadata API: Mimir will now return an empty object when no metadata is available, matching Prometheus. #4782 * [BUGFIX] Store-gateway: add collision detection on expanded postings and individual postings cache keys. #4770 diff --git a/Makefile b/Makefile index 8a189bbb360..58ff03d3969 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 98a9362e323..88a52953ce7 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.20.2 diff --git a/development/mimir-read-write-mode/dev.dockerfile b/development/mimir-read-write-mode/dev.dockerfile index 98a9362e323..88a52953ce7 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.20.2 diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile index c0902f1bd70..feab0dc91cc 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"