From 56e7eff635e4ae72983d8e25e163063b49b9e937 Mon Sep 17 00:00:00 2001
From: Arve Knudsen <arve.knudsen@gmail.com>
Date: Wed, 11 Oct 2023 12:12:47 +0200
Subject: [PATCH] [release-2.10] Backport chore(deps): update golang docker tag
 to v1.21.3 (main) (#6325) (#6334)

* chore(deps): update golang docker tag to v1.21.3 (main) (#6325)
* Update build image version to pr6334-7c9bc193ea

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: aknuds1 <aknuds1@users.noreply.github.com>
---
 CHANGELOG.md                 | 1 +
 Makefile                     | 2 +-
 mimir-build-image/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e313ed38a15..0dc1632f5b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Grafana Mimir
 
+* [CHANGE] Update Go version to 1.21.3. #6244 #6325
 * [BUGFIX] Query-frontend: Don't retry read requests rejected by the ingester due to utilization based read path limiting. #6032
 * [BUGFIX] Ingester: fix panic in WAL replay of certain native histograms. #6086
 
diff --git a/Makefile b/Makefile
index 300d0b5be67..6774d6be14f 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,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 ?= pr5960-facaa1c135
+LATEST_BUILD_IMAGE_TAG ?= pr6334-7c9bc193ea
 
 # 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/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile
index 877cea71782..91fdfb131de 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.21.1-bullseye
+FROM golang:1.21.3-bullseye
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"