base image: update to bookworm

kubernetes · Jan 24, 2024 · c6d01ca · c6d01ca
1 parent d5a2bc9
commit c6d01ca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -436,8 +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'"
 
@@ -458,6 +456,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
@@ -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
@@ -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'