debian-base, kube-cross, go-runner, ci, k8s-ci-builder: switch to boo…

…kworm

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

dependencies.yaml

@@ -151,27 +151,27 @@ 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
       match: REVISION \?= \d+
     - 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
@@ -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)"
@@ -379,57 +379,62 @@ dependencies:
   - name: "Debian: codename (default)"
     version: bullseye
     refPaths:
-    - path: images/build/cross/Makefile
-      match: OS_CODENAME\ \?=\ bullseye
-    - path: images/build/cross/variants.yaml
-      match: "OS_CODENAME: 'bullseye'"
-    - path: images/build/debian-base/Makefile
-      match: CONFIG\ \?=\ bullseye
-    - path: images/build/debian-base/variants.yaml
-      match: "CONFIG: 'bullseye'"
+    # TODO: uncomment once bookworm is the default
+    # - path: images/build/cross/Makefile
+    #   match: OS_CODENAME\ \?=\ bullseye
+    # - path: images/build/cross/variants.yaml
+    #   match: "OS_CODENAME: 'bullseye'"
+    # TODO: uncomment once bookworm is the default
+    # - path: images/build/debian-base/Makefile
+    #   match: CONFIG\ \?=\ bullseye
+    # - path: images/build/debian-base/variants.yaml
+    #   match: "CONFIG: 'bullseye'"
     - path: images/build/debian-iptables/Makefile
       match: CONFIG\ \?=\ bullseye
     - 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: uncomment once bookworm is the default
+    # - 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
       match: "CONFIG: 'bullseye'"
-    - path: images/releng/ci/variants.yaml
-      match: "OS_CODENAME: 'bullseye'"
-    - path: images/releng/k8s-ci-builder/Makefile
-      match: OS_CODENAME\ \?=\ bullseye
-    - path: images/releng/k8s-ci-builder/variants.yaml
-      match: "OS_CODENAME: 'bullseye'"
+    # TODO: uncomment once bookworm is the default
+    # - path: images/releng/ci/variants.yaml
+    #   match: "OS_CODENAME: 'bullseye'"
+    # - path: images/releng/k8s-ci-builder/Makefile
+    #   match: OS_CODENAME\ \?=\ bullseye
+    # - path: images/releng/k8s-ci-builder/variants.yaml
+    #   match: "OS_CODENAME: 'bullseye'"
     - path: packages/deb/Dockerfile
       match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-bullseye
 
   - name: "Debian: codename (next candidate)"
-    version: bullseye
+    version: bookworm
     refPaths:
-    - path: images/build/cross/variants.yaml
-      match: "OS_CODENAME: 'bullseye'"
+      # TODO: XXX
+      # - path: images/build/cross/variants.yaml
+      #   match: "OS_CODENAME: 'bullseye'"
     - 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.0.0
     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
@@ -475,10 +480,10 @@ dependencies:
 
   # Base images (next candidate)
   - name: "registry.k8s.io/build-image/debian-base (next candidate)"
-    version: bullseye-v1.4.3
+    version: bookworm-v1.0.0
     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

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
 

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'

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.0.0
+CONFIG ?= bookworm
 
 TAR_FILE ?= rootfs.tar
 ARCH ?= amd64

images/build/debian-base/bullseye/Dockerfile.build → 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).

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.0.0'

images/build/go-runner/Makefile

@@ -20,7 +20,7 @@ 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

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'
+  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'