From 8bbf36ffbaaef9bb800d111cc68848c872dc0c34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Fri, 11 Oct 2024 10:13:04 +0200 Subject: [PATCH 1/3] chore: update Go to 1.23.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Reinhard Nägele --- Dockerfile | 2 +- Makefile | 2 +- go.mod | 4 ++-- scripts/go.mod | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 350d60752..e0e65cf49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Update the base image in Makefile when updating golang version. This has to # be pre-pulled in order to work on GCB. ARG ARCH -FROM golang:1.23.1 as build +FROM golang:1.23.2 as build WORKDIR /go/src/sigs.k8s.io/metrics-server COPY go.mod . diff --git a/Makefile b/Makefile index 7e34a90fc..b704bb538 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ CONTAINER_ARCH_TARGETS=$(addprefix container-,$(ALL_ARCHITECTURES)) container: # Pull base image explicitly. Keep in sync with Dockerfile, otherwise # GCB builds will start failing. - docker pull golang:1.23.1 + docker pull golang:1.23.2 docker build -t $(REGISTRY)/metrics-server-$(ARCH):$(CHECKSUM) --build-arg ARCH=$(ARCH) --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT) . .PHONY: container-all diff --git a/go.mod b/go.mod index 6feb86f55..aeb1c688f 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module sigs.k8s.io/metrics-server -go 1.23.0 +go 1.23.2 -toolchain go1.23.1 +toolchain go1.23.2 require ( github.com/google/go-cmp v0.6.0 diff --git a/scripts/go.mod b/scripts/go.mod index 75fc4ac41..da017d0fc 100644 --- a/scripts/go.mod +++ b/scripts/go.mod @@ -1,8 +1,8 @@ module sigs.k8s.io/metrics-server/scripts -go 1.23.0 +go 1.23.2 -toolchain go1.23.1 +toolchain go1.23.2 require ( github.com/google/addlicense v1.1.1 From 6e792b5644b8668778ceb02ff706977caaa20a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Fri, 15 Nov 2024 11:44:37 +0100 Subject: [PATCH 2/3] chore: update Go to 1.23.3 --- Dockerfile | 2 +- Makefile | 2 +- go.mod | 4 +--- scripts/go.mod | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e0e65cf49..fed14f6ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Update the base image in Makefile when updating golang version. This has to # be pre-pulled in order to work on GCB. ARG ARCH -FROM golang:1.23.2 as build +FROM golang:1.23.3 as build WORKDIR /go/src/sigs.k8s.io/metrics-server COPY go.mod . diff --git a/Makefile b/Makefile index b704bb538..ae2cd7658 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ CONTAINER_ARCH_TARGETS=$(addprefix container-,$(ALL_ARCHITECTURES)) container: # Pull base image explicitly. Keep in sync with Dockerfile, otherwise # GCB builds will start failing. - docker pull golang:1.23.2 + docker pull golang:1.23.3 docker build -t $(REGISTRY)/metrics-server-$(ARCH):$(CHECKSUM) --build-arg ARCH=$(ARCH) --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT) . .PHONY: container-all diff --git a/go.mod b/go.mod index aeb1c688f..ece849680 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module sigs.k8s.io/metrics-server -go 1.23.2 - -toolchain go1.23.2 +go 1.23.3 require ( github.com/google/go-cmp v0.6.0 diff --git a/scripts/go.mod b/scripts/go.mod index da017d0fc..58e27250d 100644 --- a/scripts/go.mod +++ b/scripts/go.mod @@ -1,8 +1,6 @@ module sigs.k8s.io/metrics-server/scripts -go 1.23.2 - -toolchain go1.23.2 +go 1.23.3 require ( github.com/google/addlicense v1.1.1 From 2f516929d7eec1768c7ce3bfe9fcb6f4e9c0cb77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reinhard=20N=C3=A4gele?= Date: Fri, 13 Dec 2024 10:55:30 +0100 Subject: [PATCH 3/3] chore: update Go to 1.23.4 --- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- scripts/go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fed14f6ab..5b6432026 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Update the base image in Makefile when updating golang version. This has to # be pre-pulled in order to work on GCB. ARG ARCH -FROM golang:1.23.3 as build +FROM golang:1.23.4 as build WORKDIR /go/src/sigs.k8s.io/metrics-server COPY go.mod . diff --git a/Makefile b/Makefile index ae2cd7658..a5884dcd5 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ CONTAINER_ARCH_TARGETS=$(addprefix container-,$(ALL_ARCHITECTURES)) container: # Pull base image explicitly. Keep in sync with Dockerfile, otherwise # GCB builds will start failing. - docker pull golang:1.23.3 + docker pull golang:1.23.4 docker build -t $(REGISTRY)/metrics-server-$(ARCH):$(CHECKSUM) --build-arg ARCH=$(ARCH) --build-arg GIT_TAG=$(GIT_TAG) --build-arg GIT_COMMIT=$(GIT_COMMIT) . .PHONY: container-all diff --git a/go.mod b/go.mod index ece849680..e65483aa3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/metrics-server -go 1.23.3 +go 1.23.4 require ( github.com/google/go-cmp v0.6.0 diff --git a/scripts/go.mod b/scripts/go.mod index 58e27250d..859d4c4db 100644 --- a/scripts/go.mod +++ b/scripts/go.mod @@ -1,6 +1,6 @@ module sigs.k8s.io/metrics-server/scripts -go 1.23.3 +go 1.23.4 require ( github.com/google/addlicense v1.1.1