From 7e4e3e803b24246f384bab091638be1a4251bd26 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 21 Jun 2023 14:41:16 +0200 Subject: [PATCH] Switch to debian bookworm Signed-off-by: Sascha Grunert --- Dockerfile-kubepkg | 4 +- Dockerfile-kubepkg-rpm | 2 +- dependencies.yaml | 152 +++++++++--------- images/build/cross/Makefile | 6 +- images/build/cross/variants.yaml | 32 ++-- images/build/debian-base/Makefile | 4 +- .../{bullseye => bookworm}/Dockerfile | 0 .../{bullseye => bookworm}/Dockerfile.build | 19 +-- .../{bullseye => bookworm}/clean-install | 0 .../{bullseye => bookworm}/excludes | 0 images/build/debian-base/variants.yaml | 7 +- images/build/debian-iptables/Makefile | 8 +- .../{bullseye => bookworm}/Dockerfile | 0 .../{bullseye => bookworm}/iptables-wrapper | 0 images/build/debian-iptables/variants.yaml | 11 +- images/build/distroless-iptables/Makefile | 4 +- .../build/distroless-iptables/variants.yaml | 2 +- images/build/go-runner/Makefile | 4 +- images/build/go-runner/variants.yaml | 20 +-- images/build/setcap/Dockerfile | 2 +- images/build/setcap/Makefile | 6 +- images/build/setcap/variants.yaml | 9 +- images/k8s-cloud-builder/variants.yaml | 16 +- images/releng/ci/variants.yaml | 12 +- images/releng/k8s-ci-builder/Makefile | 2 +- images/releng/k8s-ci-builder/variants.yaml | 12 +- packages/deb/Dockerfile | 2 +- 27 files changed, 158 insertions(+), 178 deletions(-) rename images/build/debian-base/{bullseye => bookworm}/Dockerfile (100%) rename images/build/debian-base/{bullseye => bookworm}/Dockerfile.build (79%) rename images/build/debian-base/{bullseye => bookworm}/clean-install (100%) rename images/build/debian-base/{bullseye => bookworm}/excludes (100%) rename images/build/debian-iptables/{bullseye => bookworm}/Dockerfile (100%) rename images/build/debian-iptables/{bullseye => bookworm}/iptables-wrapper (100%) diff --git a/Dockerfile-kubepkg b/Dockerfile-kubepkg index 50f345da6ee2..f38fb486dbc5 100644 --- a/Dockerfile-kubepkg +++ b/Dockerfile-kubepkg @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20.5-bullseye AS builder +FROM golang:1.20.5-bookworm AS builder ENV GO111MODULE=on @@ -23,7 +23,7 @@ COPY . . RUN go build -o . ./cmd/kubepkg/... -FROM debian:buster +FROM debian:bookworm ENV DEBIAN_FRONTEND=noninteractive diff --git a/Dockerfile-kubepkg-rpm b/Dockerfile-kubepkg-rpm index a8b0b5e4196e..6a5aa319241c 100644 --- a/Dockerfile-kubepkg-rpm +++ b/Dockerfile-kubepkg-rpm @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20.5-bullseye AS builder +FROM golang:1.20.5-bookworm AS builder ENV GO111MODULE=on diff --git a/dependencies.yaml b/dependencies.yaml index 1161a80764c4..61e3052f00d1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -60,9 +60,9 @@ dependencies: version: 1.20.5 refPaths: - path: Dockerfile-kubepkg - match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder + match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-bookworm AS builder - path: Dockerfile-kubepkg-rpm - match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder + match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-bookworm AS builder - path: images/build/cross/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? - path: images/build/cross/variants.yaml @@ -74,7 +74,7 @@ dependencies: - path: images/releng/ci/variants.yaml match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'" - path: packages/deb/Dockerfile - match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-bullseye + match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-bookworm # Golang pre-releases are denoted as `1.y.z` # Example: go1.17rc1 @@ -128,8 +128,8 @@ dependencies: # a SemVer regex on the IMAGE_VERSION. # # Example: - # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: - # - v1.100-go1.17-bullseye.0 does not + # - v1.100.0-go1.17-bookworm.0 satisfies SemVer regex, while: + # - v1.100-go1.17-bookworm.0 does not - name: "Kubernetes version (stable.0)" version: v1.27.0 refPaths: @@ -151,13 +151,13 @@ dependencies: match: REVISION:\ '\d+' # go-runner - - 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 @@ -165,13 +165,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 @@ -181,16 +181,16 @@ dependencies: # kube-cross - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)" - version: v1.27.0-go1.20.5-bullseye.0 + version: v1.27.0-go1.20.5-bookworm.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: '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/kube-cross: config variant (v1.27-go1.20)" - version: go1.20-bullseye + version: go1.20-bookworm refPaths: - path: images/build/cross/variants.yaml - match: "CONFIG: 'go\\d+.\\d+-bullseye'" + match: "CONFIG: 'go\\d+.\\d+-bookworm'" - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.27-go1.20)" version: 0 @@ -201,16 +201,16 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.19)" - version: v1.26.0-go1.19.10-bullseye.0 + version: v1.26.0-go1.19.10-bookworm.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: '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/kube-cross: config variant (v1.26-go1.19)" - version: go1.19-bullseye + version: go1.19-bookworm refPaths: - path: images/build/cross/variants.yaml - match: "CONFIG: 'go\\d+.\\d+-bullseye'" + match: "CONFIG: 'go\\d+.\\d+-bookworm'" - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.26-go1.19)" version: 0 @@ -221,16 +221,16 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross (v1.25-go1.19)" - version: v1.25.0-go1.19.10-bullseye.0 + version: v1.25.0-go1.19.10-bookworm.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: '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/kube-cross: config variant (v1.25-go1.19)" - version: go1.19-bullseye + version: go1.19-bookworm refPaths: - path: images/build/cross/variants.yaml - match: "CONFIG: 'go\\d+.\\d+-bullseye'" + match: "CONFIG: 'go\\d+.\\d+-bookworm'" - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.25-go1.19)" version: 0 @@ -241,16 +241,16 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross (v1.24-go1.19)" - version: v1.24.0-go1.19.10-bullseye.0 + version: v1.24.0-go1.19.10-bookworm.0 refPaths: - path: images/build/cross/variants.yaml match: "IMAGE_VERSION: '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/kube-cross: config variant (v1.24-go1.19)" - version: go1.19-bullseye + version: go1.19-bookworm refPaths: - path: images/build/cross/variants.yaml - match: "CONFIG: 'go\\d+.\\d+-bullseye'" + match: "CONFIG: 'go\\d+.\\d+-bookworm'" - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.24-go1.19)" version: 0 @@ -261,25 +261,25 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.27-cross1.20)" - version: v1.27.0-go1.20.5-bullseye.0 + version: v1.27.0-go1.20.5-bookworm.0 refPaths: - path: images/k8s-cloud-builder/variants.yaml match: "KUBE_CROSS_VERSION: '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/kube-cross: dependents k8s-cloud-builder (v1.26-cross1.20)" - version: v1.26.0-go1.19.10-bullseye.0 + version: v1.26.0-go1.19.10-bookworm.0 refPaths: - path: images/k8s-cloud-builder/variants.yaml match: "KUBE_CROSS_VERSION: '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/kube-cross: dependents k8s-cloud-builder (v1.25-cross1.20)" - version: v1.25.0-go1.19.10-bullseye.0 + version: v1.25.0-go1.19.10-bookworm.0 refPaths: - path: images/k8s-cloud-builder/variants.yaml match: "KUBE_CROSS_VERSION: '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/kube-cross: dependents k8s-cloud-builder (v1.24-cross1.20)" - version: v1.24.0-go1.19.10-bullseye.0 + version: v1.24.0-go1.19.10-bookworm.0 refPaths: - path: images/k8s-cloud-builder/variants.yaml match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" @@ -305,10 +305,10 @@ dependencies: match: REVISION:\ '\d+' - name: "registry.k8s.io/build-image/kube-cross: config variant (next candidate)" - version: go1.20-bullseye + version: go1.20-bookworm refPaths: - path: images/build/cross/variants.yaml - match: "CONFIG: 'go\\d+.\\d+-bullseye'" + match: "CONFIG: 'go\\d+.\\d+-bookworm'" # Golang (previous release branches: 1.26) - name: "golang (previous release branches: 1.26)" @@ -377,79 +377,79 @@ dependencies: # Base images - name: "Debian: codename (default)" - version: bullseye + version: bookworm refPaths: - path: images/build/cross/Makefile - match: OS_CODENAME\ \?=\ bullseye + match: OS_CODENAME\ \?=\ bookworm - path: images/build/cross/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - path: images/build/debian-base/Makefile - match: CONFIG\ \?=\ bullseye + match: CONFIG\ \?=\ bookworm - path: images/build/debian-base/variants.yaml - match: "CONFIG: 'bullseye'" + match: "CONFIG: 'bookworm'" - path: images/build/debian-iptables/Makefile - match: CONFIG\ \?=\ bullseye + match: CONFIG\ \?=\ bookworm - path: images/build/debian-iptables/variants.yaml - match: "CONFIG: 'bullseye'" + match: "CONFIG: 'bookworm'" # Must match distroless Debian version as well - path: images/build/go-runner/Makefile - match: OS_CODENAME\ \?=\ bullseye + match: OS_CODENAME\ \?=\ bookworm - path: images/build/go-runner/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - path: images/build/setcap/Makefile - match: CONFIG\ \?=\ bullseye + match: CONFIG\ \?=\ bookworm - path: images/build/setcap/variants.yaml - match: "CONFIG: 'bullseye'" + match: "CONFIG: 'bookworm'" - path: images/releng/ci/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - path: images/releng/k8s-ci-builder/Makefile - match: OS_CODENAME\ \?=\ bullseye + match: OS_CODENAME\ \?=\ bookworm - path: images/releng/k8s-ci-builder/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - path: packages/deb/Dockerfile - match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-bullseye + match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-bookworm - name: "Debian: codename (next candidate)" - version: bullseye + version: bookworm refPaths: - path: images/build/cross/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - path: images/build/debian-base/variants.yaml - match: "CONFIG: 'bullseye'" + match: "CONFIG: 'bookworm'" - path: images/build/go-runner/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - path: images/releng/ci/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - path: images/releng/k8s-ci-builder/variants.yaml - match: "OS_CODENAME: 'bullseye'" + match: "OS_CODENAME: 'bookworm'" - name: "registry.k8s.io/build-image/debian-base" - version: bullseye-v1.4.3 + version: bookworm-v1.4.3 refPaths: - path: images/build/debian-base/Makefile - match: IMAGE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) + match: IMAGE_VERSION\ \?=\ bookworm-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - path: images/build/debian-base/variants.yaml - match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "IMAGE_VERSION: 'bookworm-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/debian-base: dependents" - version: bullseye-v1.4.3 + version: bookworm-v1.4.3 refPaths: - path: images/build/debian-iptables/Makefile - match: DEBIAN_BASE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) + match: DEBIAN_BASE_VERSION\ \?=\ bookworm-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - path: images/build/debian-iptables/variants.yaml - match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "DEBIAN_BASE_VERSION: 'bookworm-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" - path: images/build/setcap/Makefile - match: DEBIAN_BASE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) + match: DEBIAN_BASE_VERSION\ \?=\ bookworm-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - path: images/build/setcap/variants.yaml - match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "DEBIAN_BASE_VERSION: 'bookworm-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/debian-iptables" - version: bullseye-v1.5.7 + version: bookworm-v1.5.7 refPaths: - path: images/build/debian-iptables/Makefile - match: IMAGE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) + match: IMAGE_VERSION\ \?=\ bookworm-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - path: images/build/debian-iptables/variants.yaml - match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "IMAGE_VERSION: 'bookworm-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/distroless-iptables" version: v0.2.5 @@ -458,47 +458,47 @@ dependencies: match: IMAGE_VERSION\ \?=\ 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: dependents" - version: v2.3.1-go1.20.5-bullseye.0 + version: v2.3.1-go1.20.5-bookworm.0 refPaths: - path: images/build/debian-iptables/Makefile - match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+ + match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bookworm\.\d+ - path: images/build/distroless-iptables/Makefile - match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+ + match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bookworm\.\d+ - name: "registry.k8s.io/build-image/setcap" - version: bullseye-v1.4.2 + version: bookworm-v1.4.2 refPaths: - path: images/build/setcap/Makefile - match: IMAGE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) + match: IMAGE_VERSION\ \?=\ bookworm-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - path: images/build/setcap/variants.yaml - match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "IMAGE_VERSION: 'bookworm-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" # Base images (next candidate) - name: "registry.k8s.io/build-image/debian-base (next candidate)" - version: bullseye-v1.4.3 + version: bookworm-v1.4.3 refPaths: - path: images/build/debian-base/variants.yaml - match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "IMAGE_VERSION: 'bookworm-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/debian-base: dependents (next candidate)" - version: bullseye-v1.4.3 + version: bookworm-v1.4.3 refPaths: - path: images/build/debian-iptables/variants.yaml - match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "DEBIAN_BASE_VERSION: 'bookworm-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" - path: images/build/setcap/variants.yaml - match: "DEBIAN_BASE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "DEBIAN_BASE_VERSION: 'bookworm-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/debian-iptables (next candidate)" - version: bullseye-v1.5.7 + version: bookworm-v1.5.7 refPaths: - path: images/build/debian-iptables/variants.yaml - match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "IMAGE_VERSION: 'bookworm-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/setcap (next candidate)" - version: bullseye-v1.4.2 + version: bookworm-v1.4.2 refPaths: - path: images/build/setcap/variants.yaml - match: "IMAGE_VERSION: 'bullseye-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" + match: "IMAGE_VERSION: 'bookworm-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'" # Build environments - name: "gcr.io/k8s-staging-test-infra/gcb-docker-gcloud" diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index 94bb12cb9e8a..d5861015c20f 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -25,12 +25,12 @@ IMGNAME = kube-cross # a SemVer regex on the IMAGE_VERSION. # # Example: -# - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while: -# - v1.100-go1.17-bullseye.0 does not +# - v1.100.0-go1.17-bookworm.0 satisfies SemVer regex, while: +# - v1.100-go1.17-bookworm.0 does not KUBERNETES_VERSION ?= v1.27.0 GO_VERSION ?= 1.20.5 GO_MAJOR_VERSION ?= 1.20 -OS_CODENAME ?= bullseye +OS_CODENAME ?= bookworm REVISION ?= 0 TYPE ?= default diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index e085066352b6..115f7ddec5ba 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -1,41 +1,41 @@ variants: - v1.27-go1.20-bullseye: - CONFIG: 'go1.20-bullseye' + v1.27-go1.20-bookworm: + CONFIG: 'go1.20-bookworm' TYPE: 'default' - IMAGE_VERSION: 'v1.27.0-go1.20.5-bullseye.0' + IMAGE_VERSION: 'v1.27.0-go1.20.5-bookworm.0' KUBERNETES_VERSION: 'v1.27.0' GO_VERSION: '1.20.5' GO_MAJOR_VERSION: '1.20' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' PROTOBUF_VERSION: '3.19.4' - v1.26-go1.19-bullseye: - CONFIG: 'go1.19-bullseye' + v1.26-go1.19-bookworm: + CONFIG: 'go1.19-bookworm' TYPE: 'default' - IMAGE_VERSION: 'v1.26.0-go1.19.10-bullseye.0' + IMAGE_VERSION: 'v1.26.0-go1.19.10-bookworm.0' KUBERNETES_VERSION: 'v1.26.0' GO_VERSION: '1.19.10' GO_MAJOR_VERSION: '1.19' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' PROTOBUF_VERSION: '3.19.4' - v1.25-go1.19-bullseye: - CONFIG: 'go1.19-bullseye' + v1.25-go1.19-bookworm: + CONFIG: 'go1.19-bookworm' TYPE: 'default' - IMAGE_VERSION: 'v1.25.0-go1.19.10-bullseye.0' + IMAGE_VERSION: 'v1.25.0-go1.19.10-bookworm.0' KUBERNETES_VERSION: 'v1.25.0' GO_VERSION: '1.19.10' GO_MAJOR_VERSION: '1.19' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' PROTOBUF_VERSION: '3.19.4' - v1.24-go1.19-bullseye: - CONFIG: 'go1.19-bullseye' + v1.24-go1.19-bookworm: + CONFIG: 'go1.19-bookworm' TYPE: 'default' - IMAGE_VERSION: 'v1.24.0-go1.19.10-bullseye.0' + IMAGE_VERSION: 'v1.24.0-go1.19.10-bookworm.0' KUBERNETES_VERSION: 'v1.24.0' GO_VERSION: '1.19.10' GO_MAJOR_VERSION: '1.19' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' PROTOBUF_VERSION: '3.19.4' diff --git a/images/build/debian-base/Makefile b/images/build/debian-base/Makefile index 9059f85c12ac..f4da4e183e8e 100755 --- a/images/build/debian-base/Makefile +++ b/images/build/debian-base/Makefile @@ -19,8 +19,8 @@ IMAGE ?= $(REGISTRY)/debian-base BUILD_IMAGE ?= debian-build TAG ?= $(shell git describe --tags --always --dirty) -IMAGE_VERSION ?= bullseye-v1.4.3 -CONFIG ?= bullseye +IMAGE_VERSION ?= bookworm-v1.4.3 +CONFIG ?= bookworm TAR_FILE ?= rootfs.tar ARCH ?= amd64 diff --git a/images/build/debian-base/bullseye/Dockerfile b/images/build/debian-base/bookworm/Dockerfile similarity index 100% rename from images/build/debian-base/bullseye/Dockerfile rename to images/build/debian-base/bookworm/Dockerfile diff --git a/images/build/debian-base/bullseye/Dockerfile.build b/images/build/debian-base/bookworm/Dockerfile.build similarity index 79% rename from images/build/debian-base/bullseye/Dockerfile.build rename to images/build/debian-base/bookworm/Dockerfile.build index 5eb8f5cc4092..c1b0ad9f2e4b 100644 --- a/images/build/debian-base/bullseye/Dockerfile.build +++ b/images/build/debian-base/bookworm/Dockerfile.build @@ -41,24 +41,7 @@ RUN apt-get update \ && apt-get dist-upgrade -y # Hold required packages to avoid breaking the installation of packages -RUN apt-mark hold apt gnupg adduser passwd libsemanage1 libcap2 - -# Remove unnecessary packages. -# This list was generated manually by listing the installed packages (`apt list --installed`), -# then running `apt-cache rdepends --installed --no-recommends` to find the "root" packages. -# The root packages were evaluated based on whether they were needed in the container image. -# Several utilities (e.g. ping) were kept for usefulness, but may be removed in later versions. -RUN echo "Yes, do as I say!" | apt-get purge \ - bash \ - e2fsprogs \ - libcap2-bin \ - libmount1 \ - libsmartcols1 \ - libblkid1 \ - libss2 \ - ncurses-base \ - ncurses-bin \ - tzdata +RUN apt-mark hold apt gnupg adduser passwd libsemanage2 libcap2 # No-op stubs replace some unnecessary binaries that may be depended on in the install process (in # particular we don't run an init process). diff --git a/images/build/debian-base/bullseye/clean-install b/images/build/debian-base/bookworm/clean-install similarity index 100% rename from images/build/debian-base/bullseye/clean-install rename to images/build/debian-base/bookworm/clean-install diff --git a/images/build/debian-base/bullseye/excludes b/images/build/debian-base/bookworm/excludes similarity index 100% rename from images/build/debian-base/bullseye/excludes rename to images/build/debian-base/bookworm/excludes diff --git a/images/build/debian-base/variants.yaml b/images/build/debian-base/variants.yaml index f3b34a26b246..2dc3c9e6e02d 100644 --- a/images/build/debian-base/variants.yaml +++ b/images/build/debian-base/variants.yaml @@ -1,5 +1,4 @@ variants: - # Debian 11 - Kubernetes 1.23 and newer - bullseye: - CONFIG: 'bullseye' - IMAGE_VERSION: 'bullseye-v1.4.3' + bookworm: + CONFIG: 'bookworm' + IMAGE_VERSION: 'bookworm-v1.4.3' diff --git a/images/build/debian-iptables/Makefile b/images/build/debian-iptables/Makefile index 95eabddfbb86..4ed3f7799f55 100644 --- a/images/build/debian-iptables/Makefile +++ b/images/build/debian-iptables/Makefile @@ -18,10 +18,10 @@ REGISTRY?="gcr.io/k8s-staging-build-image" IMAGE=$(REGISTRY)/debian-iptables TAG ?= $(shell git describe --tags --always --dirty) -IMAGE_VERSION ?= bullseye-v1.5.7 -CONFIG ?= bullseye -DEBIAN_BASE_VERSION ?= bullseye-v1.4.3 -GORUNNER_VERSION ?= v2.3.1-go1.20.5-bullseye.0 +IMAGE_VERSION ?= bookworm-v1.5.7 +CONFIG ?= bookworm +DEBIAN_BASE_VERSION ?= bookworm-v1.4.3 +GORUNNER_VERSION ?= v2.3.1-go1.20.5-bookworm.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x diff --git a/images/build/debian-iptables/bullseye/Dockerfile b/images/build/debian-iptables/bookworm/Dockerfile similarity index 100% rename from images/build/debian-iptables/bullseye/Dockerfile rename to images/build/debian-iptables/bookworm/Dockerfile diff --git a/images/build/debian-iptables/bullseye/iptables-wrapper b/images/build/debian-iptables/bookworm/iptables-wrapper similarity index 100% rename from images/build/debian-iptables/bullseye/iptables-wrapper rename to images/build/debian-iptables/bookworm/iptables-wrapper diff --git a/images/build/debian-iptables/variants.yaml b/images/build/debian-iptables/variants.yaml index ddec8b2fe909..c025f541e894 100644 --- a/images/build/debian-iptables/variants.yaml +++ b/images/build/debian-iptables/variants.yaml @@ -1,7 +1,6 @@ variants: - # Debian 11 - Kubernetes 1.23 and newer - bullseye: - CONFIG: 'bullseye' - IMAGE_VERSION: 'bullseye-v1.5.7' - DEBIAN_BASE_VERSION: 'bullseye-v1.4.3' - GORUNNER_VERSION: 'v2.3.1-go1.20.5-bullseye.0' + bookworm: + CONFIG: 'bookworm' + IMAGE_VERSION: 'bookworm-v1.5.7' + DEBIAN_BASE_VERSION: 'bookworm-v1.4.3' + GORUNNER_VERSION: 'v2.3.1-go1.20.5-bookworm.0' diff --git a/images/build/distroless-iptables/Makefile b/images/build/distroless-iptables/Makefile index 3c4bb2d23cef..3aec7ff2cd04 100644 --- a/images/build/distroless-iptables/Makefile +++ b/images/build/distroless-iptables/Makefile @@ -20,8 +20,8 @@ IMAGE=$(REGISTRY)/distroless-iptables TAG ?= $(shell git describe --tags --always --dirty) IMAGE_VERSION ?= v0.2.5 CONFIG ?= distroless -BASEIMAGE ?= debian:bullseye-slim -GORUNNER_VERSION ?= v2.3.1-go1.20.5-bullseye.0 +BASEIMAGE ?= debian:bookworm-slim +GORUNNER_VERSION ?= v2.3.1-go1.20.5-bookworm.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x diff --git a/images/build/distroless-iptables/variants.yaml b/images/build/distroless-iptables/variants.yaml index cfce12d0ef13..298584c097e1 100644 --- a/images/build/distroless-iptables/variants.yaml +++ b/images/build/distroless-iptables/variants.yaml @@ -2,4 +2,4 @@ variants: distroless: CONFIG: 'distroless' IMAGE_VERSION: 'v0.2.5' - GORUNNER_VERSION: 'v2.3.1-go1.20.5-bullseye.0' + GORUNNER_VERSION: 'v2.3.1-go1.20.5-bookworm.0' diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index c3bd9d0c821b..ec299a252062 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 86ff2977054b..318d0534c50c 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,17 +1,17 @@ variants: - go1.20-bullseye: - CONFIG: 'go1.20-bullseye' - IMAGE_VERSION: 'v2.3.1-go1.20.5-bullseye.0' + 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' diff --git a/images/build/setcap/Dockerfile b/images/build/setcap/Dockerfile index 1a6ba8ef7046..38215885213d 100644 --- a/images/build/setcap/Dockerfile +++ b/images/build/setcap/Dockerfile @@ -20,5 +20,5 @@ ARG BASEIMAGE RUN apt-get update \ && CODENAME=$(. /etc/os-release; echo $VERSION_CODENAME) && \ - if [ "bullseye" = "$CODENAME" ]; then apt-get -y --allow-change-held-packages install libcap2; fi \ + if [ "bookworm" = "$CODENAME" ]; then apt-get -y --allow-change-held-packages install libcap2; fi \ && apt-get -y --no-install-recommends install libcap2-bin diff --git a/images/build/setcap/Makefile b/images/build/setcap/Makefile index 94d85181a023..2562935de8d2 100644 --- a/images/build/setcap/Makefile +++ b/images/build/setcap/Makefile @@ -18,9 +18,9 @@ REGISTRY?="gcr.io/k8s-staging-build-image" IMAGE=$(REGISTRY)/setcap TAG ?= $(shell git describe --tags --always --dirty) -IMAGE_VERSION ?= bullseye-v1.4.2 -CONFIG ?= bullseye -DEBIAN_BASE_VERSION ?= bullseye-v1.4.3 +IMAGE_VERSION ?= bookworm-v1.4.2 +CONFIG ?= bookworm +DEBIAN_BASE_VERSION ?= bookworm-v1.4.3 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x diff --git a/images/build/setcap/variants.yaml b/images/build/setcap/variants.yaml index da17457a9a82..b17165ab49e6 100644 --- a/images/build/setcap/variants.yaml +++ b/images/build/setcap/variants.yaml @@ -1,6 +1,5 @@ variants: - # Debian 11 - Kubernetes 1.23 and newer - bullseye: - CONFIG: 'bullseye' - IMAGE_VERSION: 'bullseye-v1.4.2' - DEBIAN_BASE_VERSION: 'bullseye-v1.4.3' + bookworm: + CONFIG: 'bookworm' + IMAGE_VERSION: 'bookworm-v1.4.2' + DEBIAN_BASE_VERSION: 'bookworm-v1.4.3' diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index 2cf44e37ea51..e09f4adca181 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,13 +1,13 @@ variants: - v1.27-cross1.20-bullseye: + v1.27-cross1.20-bookworm: CONFIG: 'cross1.20' - KUBE_CROSS_VERSION: 'v1.27.0-go1.20.5-bullseye.0' - v1.26-cross1.19-bullseye: + KUBE_CROSS_VERSION: 'v1.27.0-go1.20.5-bookworm.0' + v1.26-cross1.19-bookworm: CONFIG: 'cross1.19' - KUBE_CROSS_VERSION: 'v1.26.0-go1.19.10-bullseye.0' - v1.25-cross1.19-bullseye: + KUBE_CROSS_VERSION: 'v1.26.0-go1.19.10-bookworm.0' + v1.25-cross1.19-bookworm: CONFIG: 'cross1.19' - KUBE_CROSS_VERSION: 'v1.25.0-go1.19.10-bullseye.0' - v1.24-cross1.19-bullseye: + KUBE_CROSS_VERSION: 'v1.25.0-go1.19.10-bookworm.0' + v1.24-cross1.19-bookworm: CONFIG: 'cross1.19' - KUBE_CROSS_VERSION: 'v1.24.0-go1.19.10-bullseye.0' + KUBE_CROSS_VERSION: 'v1.24.0-go1.19.10-bookworm.0' diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml index 6fab26a6aa06..ac3e435c6a90 100644 --- a/images/releng/ci/variants.yaml +++ b/images/releng/ci/variants.yaml @@ -1,11 +1,11 @@ variants: - go1.20-bullseye: - CONFIG: 'go1.20-bullseye' + go1.20-bookworm: + CONFIG: 'go1.20-bookworm' GO_VERSION: '1.20.5' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' - go1.19-bullseye: - CONFIG: 'go1.19-bullseye' + go1.19-bookworm: + CONFIG: 'go1.19-bookworm' GO_VERSION: '1.19.10' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' REVISION: '0' diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile index 24b0e23667c9..f82f6c4dd2cd 100644 --- a/images/releng/k8s-ci-builder/Makefile +++ b/images/releng/k8s-ci-builder/Makefile @@ -25,7 +25,7 @@ TAG ?= $(shell git describe --tags --always --dirty) # Build args GO_VERSION ?= 1.20.5 -OS_CODENAME ?= bullseye +OS_CODENAME ?= bookworm IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG) BUILD_ARGS = --build-arg=GO_VERSION=$(GO_VERSION) \ diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml index 878f57c9cc1c..dd4491d41aa2 100644 --- a/images/releng/k8s-ci-builder/variants.yaml +++ b/images/releng/k8s-ci-builder/variants.yaml @@ -2,24 +2,24 @@ variants: default: CONFIG: default GO_VERSION: '1.20.5' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' next: CONFIG: next GO_VERSION: '1.20.5' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' '1.27': CONFIG: '1.27' GO_VERSION: '1.20.5' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' '1.26': CONFIG: '1.26' GO_VERSION: '1.19.10' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' '1.25': CONFIG: '1.25' GO_VERSION: '1.19.10' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' '1.24': CONFIG: '1.24' GO_VERSION: '1.19.10' - OS_CODENAME: 'bullseye' + OS_CODENAME: 'bookworm' diff --git a/packages/deb/Dockerfile b/packages/deb/Dockerfile index 9766d4495450..ea0b51a6219e 100644 --- a/packages/deb/Dockerfile +++ b/packages/deb/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.20.5-bullseye +FROM golang:1.20.5-bookworm RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -y \