Switch to debian bookworm

Signed-off-by: Sascha Grunert <[email protected]>

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
 

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
 

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

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

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'

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

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'

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

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'

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

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

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'

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'

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'

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) \

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'

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 \