From 030599e642cd349781edf9cf15cd433b83d574cf Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 13 May 2024 19:40:09 +0300 Subject: [PATCH 1/2] Update BASEIMAGE to debian-base:bookworm-v1.0.3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d5b85c31..8575fc5b 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ ENABLE_JOURNALD=0 endif # Set default base image to Debian 12 (Bookworm) -BASEIMAGE:=registry.k8s.io/build-image/debian-base:bookworm-v1.0.2 +BASEIMAGE:=registry.k8s.io/build-image/debian-base:bookworm-v1.0.3 # Disable cgo by default to make the binary statically linked. CGO_ENABLED:=0 From 8c22b6943126e522261bc0fb3f8f7cbef06256cb Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Mon, 13 May 2024 19:40:25 +0300 Subject: [PATCH 2/2] Update Go to v1.22.3 --- .github/workflows/update-deps.yml | 2 +- Dockerfile | 2 +- go.mod | 4 +--- test/go.mod | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml index dd6b7452..da58f925 100644 --- a/.github/workflows/update-deps.yml +++ b/.github/workflows/update-deps.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.22.1' + go-version: '1.22.3' - uses: actions/checkout@v4 - name: Update Dependencies id: update_deps diff --git a/Dockerfile b/Dockerfile index 905f6e60..b1b6bc17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ARG BASEIMAGE # Must override builder-base, not builder, since the latter is referred to later in the file and so must not be # directly replaced. See here, and note that "stage" parameter mentioned there has been renamed to # "build-context": https://github.com/docker/buildx/pull/904#issuecomment-1005871838 -FROM golang:1.22.2-bookworm as builder-base +FROM golang:1.22.3-bookworm as builder-base FROM builder-base as builder LABEL maintainer="Andy Xie " diff --git a/go.mod b/go.mod index ad112e71..93294a88 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module k8s.io/node-problem-detector -go 1.22.0 - -toolchain go1.22.1 +go 1.22.3 require ( cloud.google.com/go/compute/metadata v0.3.0 diff --git a/test/go.mod b/test/go.mod index aad1e2fe..0114613e 100644 --- a/test/go.mod +++ b/test/go.mod @@ -1,8 +1,6 @@ module k8s.io/node-problem-detector/test -go 1.22.0 - -toolchain go1.22.1 +go 1.22.3 replace k8s.io/node-problem-detector => ../.