From b04ef61a0ae77c5596c9dd2e34c47551574ce7fd Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Tue, 4 Jul 2023 12:39:23 +0200 Subject: [PATCH] go-runner: switch to debian bookworm Signed-off-by: Sascha Grunert --- dependencies.yaml | 27 +++++++++++++------------ images/build/go-runner/Makefile | 4 ++-- images/build/go-runner/variants.yaml | 30 ++++++++++++++-------------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 0d3323a498d..847715e9249 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -151,13 +151,13 @@ dependencies: match: REVISION:\ '\d+' # go-runner - - name: "registry.k8s.io/build-image/go-runner (go1.21-bullseye)" - version: v2.3.1-go1.21rc2-bullseye.0 + - name: "registry.k8s.io/build-image/go-runner (go1.21-bookworm)" + version: v2.3.1-go1.21rc2-bookworm.0 refPaths: - path: images/build/go-runner/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - - name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bullseye)" + - name: "registry.k8s.io/build-image/go-runner: image revision (go1.21-bookworm)" version: 0 refPaths: - path: images/build/go-runner/Makefile @@ -165,13 +165,13 @@ dependencies: - path: images/build/go-runner/variants.yaml match: REVISION:\ '\d+' - - name: "registry.k8s.io/build-image/go-runner (go1.20-bullseye)" - version: v2.3.1-go1.20.5-bullseye.0 + - name: "registry.k8s.io/build-image/go-runner (go1.20-bookworm)" + version: v2.3.1-go1.20.5-bookworm.0 refPaths: - path: images/build/go-runner/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - - name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bullseye)" + - name: "registry.k8s.io/build-image/go-runner: image revision (go1.20-bookworm)" version: 0 refPaths: - path: images/build/go-runner/Makefile @@ -179,13 +179,13 @@ dependencies: - path: images/build/go-runner/variants.yaml match: REVISION:\ '\d+' - - name: "registry.k8s.io/build-image/go-runner (go1.19-bullseye)" - version: v2.3.1-go1.19.10-bullseye.0 + - name: "registry.k8s.io/build-image/go-runner (go1.19-bookworm)" + version: v2.3.1-go1.19.10-bookworm.0 refPaths: - path: images/build/go-runner/variants.yaml match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - - name: "registry.k8s.io/build-image/go-runner: image revision (go1.19-bullseye)" + - name: "registry.k8s.io/build-image/go-runner: image revision (go1.19-bookworm)" version: 0 refPaths: - path: images/build/go-runner/Makefile @@ -427,10 +427,11 @@ dependencies: - path: images/build/debian-iptables/variants.yaml match: "CONFIG: 'bullseye'" # Must match distroless Debian version as well - - path: images/build/go-runner/Makefile - match: OS_CODENAME\ \?=\ bullseye - - path: images/build/go-runner/variants.yaml - match: "OS_CODENAME: 'bullseye'" + # TODO: revert once all images are on bookworm + # - path: images/build/go-runner/Makefile + # match: OS_CODENAME\ \?=\ bullseye + # - path: images/build/go-runner/variants.yaml + # match: "OS_CODENAME: 'bullseye'" - path: images/build/setcap/Makefile match: CONFIG\ \?=\ bullseye - path: images/build/setcap/variants.yaml diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index c3bd9d0c821..ec299a25206 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -20,11 +20,11 @@ APP_VERSION = $(shell cat VERSION) GO_MAJOR_VERSION ?= 1.20 REVISION ?= 0 GO_VERSION ?= 1.20.5 -OS_CODENAME ?= bullseye +OS_CODENAME ?= bookworm # Build args DISTROLESS_REGISTRY ?= gcr.io/distroless -DISTROLESS_IMAGE ?= static-debian11 +DISTROLESS_IMAGE ?= static-debian12 BUILDER_IMAGE ?= golang:$(GO_VERSION)-$(OS_CODENAME) # Configuration diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 019b71d5edf..e25fcf1e3f8 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,25 +1,25 @@ variants: - go1.21-bullseye: - CONFIG: 'go1.21-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.21rc2-bullseye.0' + go1.21-bookworm: + CONFIG: 'go1.21-bookworm' + IMAGE_VERSION: 'v2.3.1-go1.21rc2-bookworm.0' GO_MAJOR_VERSION: '1.21' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' GO_VERSION: '1.21rc2' - DISTROLESS_IMAGE: 'static-debian11' - go1.20-bullseye: - CONFIG: 'go1.20-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.20.5-bullseye.0' + DISTROLESS_IMAGE: 'static-debian12' + go1.20-bookworm: + CONFIG: 'go1.20-bookworm' + IMAGE_VERSION: 'v2.3.1-go1.20.5-bookworm.0' GO_MAJOR_VERSION: '1.20' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' GO_VERSION: '1.20.5' - DISTROLESS_IMAGE: 'static-debian11' - go1.19-bullseye: - CONFIG: 'go1.19-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.19.10-bullseye.0' + DISTROLESS_IMAGE: 'static-debian12' + go1.19-bookworm: + CONFIG: 'go1.19-bookworm' + IMAGE_VERSION: 'v2.3.1-go1.19.10-bookworm.0' GO_MAJOR_VERSION: '1.19' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' GO_VERSION: '1.19.10' - DISTROLESS_IMAGE: 'static-debian11' + DISTROLESS_IMAGE: 'static-debian12'