Merge pull request #3127 from saschagrunert/bookworm

debian-base: switch to debian bookworm

Author: k8s-ci-robot

dependencies.yaml

@@ -417,10 +417,11 @@ dependencies:
       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: revert once all images are on bookworm
+    # - 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
@@ -444,26 +445,27 @@ dependencies:
       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: revert once all images are on bookworm
+    # - path: images/build/cross/variants.yaml
+    #   match: "OS_CODENAME: 'bullseye'"
     - path: images/build/debian-base/variants.yaml
-      match: "CONFIG: 'bullseye'"
-    - path: images/build/go-runner/variants.yaml
-      match: "OS_CODENAME: 'bullseye'"
-    - path: images/releng/ci/variants.yaml
-      match: "OS_CODENAME: 'bullseye'"
-    - path: images/releng/k8s-ci-builder/variants.yaml
-      match: "OS_CODENAME: 'bullseye'"
+      match: "CONFIG: 'bookworm'"
+    # - path: images/build/go-runner/variants.yaml
+    #   match: "OS_CODENAME: 'bullseye'"
+    # - path: images/releng/ci/variants.yaml
+    #   match: "OS_CODENAME: 'bullseye'"
+    # - path: images/releng/k8s-ci-builder/variants.yaml
+    #   match: "OS_CODENAME: 'bullseye'"
 
   - 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
@@ -509,10 +511,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/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 renamed to images/build/debian-base/bookworm/Dockerfile

@@ -40,25 +40,18 @@ RUN ln -s /usr/bin/dpkg-split /usr/sbin/dpkg-split && \
 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 dpkg --purge --force-remove-essential \
+        bash \
+        e2fsprogs \
+        libss2 \
+        libcom-err2 \
+        libext2fs2 \
+        logsave \
+        ncurses-base \
+        ncurses-bin \
+        tzdata \
+    && apt-get autoremove --purge -y
 
 # 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/bullseye/Dockerfile.build renamed to images/build/debian-base/bookworm/Dockerfile.build

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