From 29f34555b536fb3dcd6ed95f7abf43dac4559485 Mon Sep 17 00:00:00 2001
From: Paco Xu <paco.xu@daocloud.io>
Date: Wed, 24 Jan 2024 16:51:08 +0800
Subject: [PATCH 1/2] base image: update to bookworm

---
 dependencies.yaml                          |  6 ++----
 images/releng/k8s-ci-builder/Makefile      |  2 +-
 images/releng/k8s-ci-builder/variants.yaml | 12 ++++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 8b2c22cc994..4b22575ae5e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -436,10 +436,6 @@ dependencies:
       # We keep them around for backwards compatibility and release branches.
     - path: images/build/go-runner/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'"
 
   - name: "Debian: codename (default)"
     version: bookworm
@@ -458,6 +454,8 @@ dependencies:
       match: "OS_CODENAME: 'bookworm'"
     - path: images/releng/k8s-ci-builder/variants.yaml
       match: "OS_CODENAME: 'bookworm'"
+    - path: images/releng/k8s-ci-builder/Makefile
+      match: OS_CODENAME\ \?=\ bookworm
 
   - name: "registry.k8s.io/build-image/debian-base"
     version: bookworm-v1.0.0
diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile
index 0be663af2a7..e9604a0dd85 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.21.6
-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 f92da002d5f..0d8700d8a21 100644
--- a/images/releng/k8s-ci-builder/variants.yaml
+++ b/images/releng/k8s-ci-builder/variants.yaml
@@ -2,7 +2,7 @@ variants:
   default:
     CONFIG: default
     GO_VERSION: '1.21.6'
-    OS_CODENAME: 'bullseye'
+    OS_CODENAME: 'bookworm'
   next:
     CONFIG: next
     GO_VERSION: '1.22rc1'
@@ -10,20 +10,20 @@ variants:
   '1.30':
     CONFIG: '1.30'
     GO_VERSION: '1.22rc1'
-    OS_CODENAME: 'bullseye'
+    OS_CODENAME: 'bookworm'
   '1.29':
     CONFIG: '1.29'
     GO_VERSION: '1.21.6'
-    OS_CODENAME: 'bullseye'
+    OS_CODENAME: 'bookworm'
   '1.28':
     CONFIG: '1.28'
     GO_VERSION: '1.20.13'
-    OS_CODENAME: 'bullseye'
+    OS_CODENAME: 'bookworm'
   '1.27':
     CONFIG: '1.27'
     GO_VERSION: '1.20.13'
-    OS_CODENAME: 'bullseye'
+    OS_CODENAME: 'bookworm'
   '1.26':
     CONFIG: '1.26'
     GO_VERSION: '1.20.13'
-    OS_CODENAME: 'bullseye'
+    OS_CODENAME: 'bookworm'

From 2f70daa0b89271bfa28a1ff9122e3a0b209712eb Mon Sep 17 00:00:00 2001
From: Paco Xu <paco.xu@daocloud.io>
Date: Wed, 24 Jan 2024 18:15:20 +0800
Subject: [PATCH 2/2] comment ulimit -Hn in wrapper.sh

---
 images/releng/k8s-ci-builder/wrapper.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/images/releng/k8s-ci-builder/wrapper.sh b/images/releng/k8s-ci-builder/wrapper.sh
index 03802a8988b..2e3c82bbb91 100755
--- a/images/releng/k8s-ci-builder/wrapper.sh
+++ b/images/releng/k8s-ci-builder/wrapper.sh
@@ -88,6 +88,8 @@ fi
 export DOCKER_IN_DOCKER_ENABLED=${DOCKER_IN_DOCKER_ENABLED:-false}
 if [[ "${DOCKER_IN_DOCKER_ENABLED}" == "true" ]]; then
   >&2 echo "wrapper.sh] [SETUP] Docker in Docker enabled, initializing ..."
+  echo "ulimits: $(ulimit -Sn):$(ulimit -Hn)"; \
+  sed -i 's/ulimit -Hn/# ulimit -Hn/g' /etc/init.d/docker; \
   # If we have opted in to docker in docker, start the docker daemon,
   service docker start
   # the service can be started but the docker socket not ready, wait for ready