diff --git a/Dockerfile b/Dockerfile index 350d60752..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.1 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 92888ee47..bfcf15d42 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.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 6feb86f55..e65483aa3 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module sigs.k8s.io/metrics-server -go 1.23.0 - -toolchain go1.23.1 +go 1.23.4 require ( github.com/google/go-cmp v0.6.0 diff --git a/scripts/go.mod b/scripts/go.mod index 75fc4ac41..859d4c4db 100644 --- a/scripts/go.mod +++ b/scripts/go.mod @@ -1,8 +1,6 @@ module sigs.k8s.io/metrics-server/scripts -go 1.23.0 - -toolchain go1.23.1 +go 1.23.4 require ( github.com/google/addlicense v1.1.1