Build nft with JSON (and xtables-compat) support

dependencies.yaml

@@ -422,7 +422,7 @@ dependencies:
         match: "DEBIAN_BASE_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 (distroless-bookworm-go1.26)"
-    version: v0.9.5
+    version: v0.9.6
     refPaths:
       - path: images/build/distroless-iptables/Makefile
         match: IMAGE_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -436,7 +436,7 @@ dependencies:
         match: GORUNNER_VERSION:\ \'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 (distroless-bookworm-go1.25)"
-    version: v0.8.13
+    version: v0.8.14
     refPaths:
       - path: images/build/distroless-iptables/variants.yaml
         match: IMAGE_VERSION:\ \'v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)\'

images/build/distroless-iptables/Makefile

@@ -18,7 +18,7 @@ REGISTRY?="gcr.io/k8s-staging-build-image"
 IMAGE=$(REGISTRY)/distroless-iptables
 
 TAG ?= $(shell git describe --tags --always --dirty)
-IMAGE_VERSION ?= v0.9.5
+IMAGE_VERSION ?= v0.9.6
 CONFIG ?= distroless-bookworm
 BASEIMAGE ?= debian:bookworm-slim
 GORUNNER_VERSION ?= v2.4.0-go1.26.5-bookworm.0

images/build/distroless-iptables/distroless-bookworm/Dockerfile

@@ -24,15 +24,15 @@ RUN apt-get -y update && \
         git ca-certificates build-essential autoconf automake libtool \
         bison flex pkg-config libgmp-dev libreadline-dev \
         libedit-dev libjansson-dev \
-        libmnl-dev libnftnl-dev
+        libmnl-dev libnftnl-dev libxtables-dev
 
 # Build nftables
 ADD --checksum=sha256:bef0c9cfdca5f8b988957046c2cb33ef9869730593da0eacae4748201acf1116 https://netfilter.org/projects/nftables/files/nftables-1.0.6.1.tar.xz /
 COPY patches /patches
 COPY setup-metadata.sh /setup-metadata.sh
 RUN cd / && tar xf /nftables-1.0.6.1.tar.xz && cd nftables-1.0.6.1 && \
     for p in $(cat /patches/series); do patch -p1 --forward < "/patches/$p" || exit 1; done && \
-    ./configure --disable-man-doc --enable-static --disable-shared --sbindir=/usr/sbin && make && make install && \
+    ./configure --with-json --with-xtables --disable-man-doc --enable-static --disable-shared --sbindir=/usr/sbin && make && make install && \
     /setup-metadata.sh
 
 RUN ldconfig

images/build/distroless-iptables/distroless-bookworm/patches/series

@@ -1 +1 @@
-free-prototype.diff
+

images/build/distroless-iptables/distroless-trixie/Dockerfile

@@ -24,15 +24,15 @@ RUN apt-get -y update && \
         git ca-certificates build-essential autoconf automake libtool \
         bison flex pkg-config libgmp-dev libreadline-dev \
         libedit-dev libjansson-dev \
-        libmnl-dev libnftnl-dev
+        libmnl-dev libnftnl-dev libxtables-dev
 
 # Build nftables
 ADD --checksum=sha256:bef0c9cfdca5f8b988957046c2cb33ef9869730593da0eacae4748201acf1116 https://netfilter.org/projects/nftables/files/nftables-1.0.6.1.tar.xz /
 COPY patches /patches
 COPY setup-metadata.sh /setup-metadata.sh
 RUN cd / && tar xf /nftables-1.0.6.1.tar.xz && cd nftables-1.0.6.1 && \
     for p in $(cat /patches/series); do patch -p1 --forward < "/patches/$p" || exit 1; done && \
-    ./configure --disable-man-doc --enable-static --disable-shared --sbindir=/usr/sbin && make && make install && \
+    ./configure --with-json --with-xtables --disable-man-doc --enable-static --disable-shared --sbindir=/usr/sbin && make && make install && \
     /setup-metadata.sh
 
 RUN ldconfig

images/build/distroless-iptables/distroless-trixie/patches/series

@@ -1 +1 @@
-free-prototype.diff
+

images/build/distroless-iptables/variants.yaml

@@ -1,11 +1,11 @@
 variants:
   distroless-bookworm-go1.26:
     CONFIG: 'distroless-bookworm'
-    IMAGE_VERSION: 'v0.9.5'
+    IMAGE_VERSION: 'v0.9.6'
     BASEIMAGE: 'debian:bookworm-slim'
     GORUNNER_VERSION: 'v2.4.0-go1.26.5-bookworm.0'
   distroless-bookworm-go1.25:
     CONFIG: 'distroless-bookworm'
-    IMAGE_VERSION: 'v0.8.13'
+    IMAGE_VERSION: 'v0.8.14'
     BASEIMAGE: 'debian:bookworm-slim'
     GORUNNER_VERSION: 'v2.4.0-go1.25.12-bookworm.0'