Merge pull request #3136 from saschagrunert/debian-iptables-bookworm

debian-iptables: switch to debian bookworm

dependencies.yaml

@@ -422,10 +422,10 @@ dependencies:
     #   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'"
+    # - 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
@@ -470,22 +470,23 @@ dependencies:
   - name: "registry.k8s.io/build-image/debian-base: dependents"
     version: bullseye-v1.4.3
     refPaths:
-    - path: images/build/debian-iptables/Makefile
-      match: DEBIAN_BASE_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-]+)*))?)
-    - path: images/build/debian-iptables/variants.yaml
-      match: "DEBIAN_BASE_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-]+)*))?)'"
+    # TODO: revert once all images are on bookworm
+    # - path: images/build/debian-iptables/Makefile
+    #   match: DEBIAN_BASE_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-]+)*))?)
+    # - path: images/build/debian-iptables/variants.yaml
+    #   match: "DEBIAN_BASE_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-]+)*))?)'"
     - path: images/build/setcap/Makefile
       match: DEBIAN_BASE_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-]+)*))?)
     - path: images/build/setcap/variants.yaml
       match: "DEBIAN_BASE_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-]+)*))?)'"
 
   - name: "registry.k8s.io/build-image/debian-iptables"
-    version: bullseye-v1.5.7
+    version: bookworm-v1.0.0
     refPaths:
     - path: images/build/debian-iptables/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-iptables/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/distroless-iptables"
     version: v0.2.5
@@ -519,16 +520,17 @@ dependencies:
   - name: "registry.k8s.io/build-image/debian-base: dependents (next candidate)"
     version: bullseye-v1.4.3
     refPaths:
-    - path: images/build/debian-iptables/variants.yaml
-      match: "DEBIAN_BASE_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-]+)*))?)'"
+    # TODO: revert once all images are on bookworm
+    #  - path: images/build/debian-iptables/variants.yaml
+    #  match: "DEBIAN_BASE_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-]+)*))?)'"
     - path: images/build/setcap/variants.yaml
       match: "DEBIAN_BASE_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-]+)*))?)'"
 
   - name: "registry.k8s.io/build-image/debian-iptables (next candidate)"
-    version: bullseye-v1.5.7
+    version: bookworm-v1.0.0
     refPaths:
     - path: images/build/debian-iptables/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/setcap (next candidate)"
     version: bullseye-v1.4.2

images/build/debian-iptables/Makefile

@@ -18,9 +18,9 @@ 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
+IMAGE_VERSION ?= bookworm-v1.0.0
+CONFIG ?= bookworm
+DEBIAN_BASE_VERSION ?= bookworm-v1.0.0
 GORUNNER_VERSION ?= v2.3.1-go1.20.5-bullseye.0
 
 ARCH?=amd64

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'
+  bookworm:
+    CONFIG: 'bookworm'
+    IMAGE_VERSION: 'bookworm-v1.0.0'
+    DEBIAN_BASE_VERSION: 'bookworm-v1.0.0'
     GORUNNER_VERSION: 'v2.3.1-go1.20.5-bullseye.0'