Update golang docker tag to v1.21.8 (#7562)

* chore(deps): update golang docker tag to v1.21.8 (main) (#7557) * chore(deps): update golang docker tag to v1.21.8 (main) * Update build image version to pr7557-ae15c572b6 * Trigger CI --------- Co-authored-by: pr00se <[email protected]> Co-authored-by: Yuri Nikolic <[email protected]> (cherry picked from commit e0a86e6) * Update build image version to pr7561-ae15c572b6 * Trigger CI * Update build image version to pr7562-ae15c572b6 * Initialize Tanka with 1.29. (#7544) * Initialize Tanka with 1.29. Signed-off-by: Peter Štibraný <[email protected]> * Update other refs. Signed-off-by: Peter Štibraný <[email protected]> --------- Signed-off-by: Peter Štibraný <[email protected]> --------- Signed-off-by: Peter Štibraný <[email protected]> Co-authored-by: Patryk Prus <[email protected]> Co-authored-by: duricanikolic <[email protected]> Co-authored-by: Peter Štibraný <[email protected]>
grafana · Mar 7, 2024 · 69a3367 · 69a3367
1 parent b212c86
commit 69a3367
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -242,7 +242,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 ?= pr7417-94e502bf74
+LATEST_BUILD_IMAGE_TAG ?= pr7562-ae15c572b6
 
 # 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/docs/sources/mimir/set-up/jsonnet/deploy.md b/docs/sources/mimir/set-up/jsonnet/deploy.md
@@ -41,7 +41,7 @@ You can use [Tanka](https://tanka.dev/) and [jsonnet-bundler](https://github.com
 
    # Initialise the Tanka.
    mkdir jsonnet-example && cd jsonnet-example
-   tk init --k8s=1.21
+   tk init --k8s=1.29
 
    # Install Mimir jsonnet.
    jb install github.com/grafana/mimir/operations/mimir@main

diff --git a/mimir-build-image/Dockerfile b/mimir-build-image/Dockerfile
@@ -4,8 +4,8 @@
 # Provenance-includes-copyright: The Cortex Authors.
 
 FROM registry.k8s.io/kustomize/kustomize:v5.3.0 as kustomize
-FROM alpine/helm:3.14.1 as helm
-FROM golang:1.21.6-bookworm
+FROM alpine/helm:3.14.2 as helm
+FROM golang:1.21.8-bookworm
 ARG goproxyValue
 ENV GOPROXY=${goproxyValue}
 ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"

diff --git a/operations/mimir-tests/build.sh b/operations/mimir-tests/build.sh
@@ -8,7 +8,7 @@ rm -rf jsonnet-tests && mkdir jsonnet-tests
 cd jsonnet-tests
 
 # Initialise the Tanka.
-tk init --k8s=1.21
+tk init --k8s=1.29
 
 # Install Mimir jsonnet from this branch.
 jb install ../operations/mimir

diff --git a/operations/mimir/getting-started.sh b/operations/mimir/getting-started.sh
@@ -5,7 +5,7 @@ set -e
 
 # Initialise the Tanka.
 mkdir jsonnet-example && cd jsonnet-example
-tk init --k8s=1.21
+tk init --k8s=1.29
 
 # Install Mimir jsonnet.
 jb install github.com/grafana/mimir/operations/mimir@main