From a208a22694825b3e1ccac72142c9586bc4031e72 Mon Sep 17 00:00:00 2001 From: Pranshu Srivastava Date: Wed, 20 Sep 2023 23:00:12 +0530 Subject: [PATCH] chore: resolve sync concerns * defer to the later go version when merging back to main (and not the older version introduced in the release branch). * resolve merge conflicts. Signed-off-by: Pranshu Srivastava --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 671ce8c541..016a024c24 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ OS ?= $(shell uname -s | tr A-Z a-z) ALL_ARCH = amd64 arm arm64 ppc64le s390x PKG = github.com/prometheus/common PROMETHEUS_VERSION = 2.46.0 -GO_VERSION = 1.20.8 +GO_VERSION = 1.21.1 IMAGE = $(REGISTRY)/kube-state-metrics MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) USER ?= $(shell id -u -n)