feat: add Kubernetes 1.37 support

.github/workflows/integration-tests.yml

@@ -63,10 +63,10 @@ jobs:
       - name: Get supported Kubernetes versions
         id: set-matrix
         run: |
-          DEFAULT="1.35"
+          DEFAULT="1.36"
           FEDORA_VERSION="44"
           # TODO: check how to configure renovate to update this list automatically
-          ALL='["1.36", "1.35", "1.34"]'
+          ALL='["1.37", "1.36", "1.35"]'
           NON_DEFAULT=$(echo "$ALL" | jq -c --arg default "$DEFAULT" 'map(select(. != $default))')
           # Construct the staging branch tag based on the branch name that is suitable for container image
           # tags. It converts all the character to lower cases, and replaces all non lower cases letter, numbers, '.'

CLAUDE.md

@@ -206,7 +206,7 @@ Host (podman)
   |
   +-- Container: k8s-mycluster-node1 (localhost/cluster:latest)
   |     |-- libvirt + qemu
-  |     |-- VM: Fedora bootc (kubeadm, crio, k8s 1.35)
+  |     |-- VM: Fedora bootc (kubeadm, crio, k8s 1.36)
   |     |     |-- NIC1 (passt): internet + SSH (2222) + API (6443, control-plane only)
   |     |     |-- NIC2 (multicast 230.0.0.1:5558): cluster network 10.0.0.0/24
   |     |     +-- Kubernetes control-plane

docs/custom-node-images.md

@@ -70,7 +70,7 @@ cd bootc
 git checkout <commit-or-branch>
 
 podman build \
-  --build-arg base=ghcr.io/bootc-dev/bink/node:v1.35-fedora-44 \
+  --build-arg base=ghcr.io/bootc-dev/bink/node:v1.36-fedora-44 \
   -t localhost/custom-bootc-node:latest \
   .
 ```
@@ -82,7 +82,7 @@ This compiles bootc from source and installs it into an image derived from the b
 For simpler cases (installing a different package version), write a minimal Containerfile:
 
 ```dockerfile
-FROM ghcr.io/bootc-dev/bink/node:v1.35-fedora-44
+FROM ghcr.io/bootc-dev/bink/node:v1.36-fedora-44
 RUN dnf -y install <your-package>
 ```
 
@@ -178,7 +178,7 @@ Containerfile.disk  ->  qcow2 disk image  (bcvk to-disk)
 >   --cap-add=all \
 >   --security-opt=label=disable \
 >   --device /dev/fuse \
->   --build-arg KUBE_MINOR=1.35 \
+>   --build-arg KUBE_MINOR=1.36 \
 >   -t localhost/custom-node:latest \
 >   -f Containerfile \
 >   .
@@ -238,7 +238,7 @@ COPY my-source/ /src
 WORKDIR /src
 RUN make build
 
-FROM ghcr.io/bootc-dev/bink/node:v1.35-fedora-44
+FROM ghcr.io/bootc-dev/bink/node:v1.36-fedora-44
 COPY --from=custom-build /src/my-binary /usr/bin/my-binary
 ```
 
@@ -294,11 +294,11 @@ Variables in `node-images/fedora/Makefile`:
 
 | Variable | Default | Description |
 |----------|---------|-------------|
-| `KUBE_MINOR` | `1.35` | Kubernetes minor version |
+| `KUBE_MINOR` | `1.36` | Kubernetes minor version |
 | `FEDORA_VERSION` | `44` | Fedora base version |
 | `DISK_SIZE` | `10G` | VM disk size |
 | `BUILD_MEMORY` | `4G` | Memory for bcvk build |
-| `BOOTC_IMAGE` | `ghcr.io/bootc-dev/bink/node:v1.35-fedora-44` | Bootc OCI image name |
-| `NODE_IMAGE` | `ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk` | Disk image name |
-| `NODE_IMAGE_COMPOSEFS` | `ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk-composefs` | Composefs disk image name |
+| `BOOTC_IMAGE` | `ghcr.io/bootc-dev/bink/node:v1.36-fedora-44` | Bootc OCI image name |
+| `NODE_IMAGE` | `ghcr.io/bootc-dev/bink/node:v1.36-fedora-44-disk` | Disk image name |
+| `NODE_IMAGE_COMPOSEFS` | `ghcr.io/bootc-dev/bink/node:v1.36-fedora-44-disk-composefs` | Composefs disk image name |
 | `BCVK_EXTRA_ARGS` | (none) | Extra flags for `bcvk to-disk` |

internal/cluster/kubeadm-config.yaml.tmpl

@@ -1,12 +1,12 @@
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: InitConfiguration
 localAPIEndpoint:
   advertiseAddress: "{{.AdvertiseAddress}}"
   bindPort: 6443
 nodeRegistration:
   criSocket: "unix:///var/run/crio/crio.sock"
 ---
-apiVersion: kubeadm.k8s.io/v1beta3
+apiVersion: kubeadm.k8s.io/v1beta4
 kind: ClusterConfiguration
 controlPlaneEndpoint: "{{.AdvertiseAddress}}:6443"
 apiServer:
@@ -15,7 +15,8 @@ apiServer:
   - "127.0.0.1"
 controllerManager:
   extraArgs:
-    flex-volume-plugin-dir: "/var/lib/kubelet/volumeplugins"
+  - name: flex-volume-plugin-dir
+    value: "/var/lib/kubelet/volumeplugins"
   extraVolumes:
   - name: flexvolume-dir
     hostPath: "/var/lib/kubelet/volumeplugins"

internal/config/defaults.go

@@ -17,7 +17,7 @@ const (
 	clusterImageBase = "ghcr.io/bootc-dev/bink/cluster"
 	dnsImageBase     = "ghcr.io/bootc-dev/bink/dns"
 
-	DefaultNodeImage = "ghcr.io/bootc-dev/bink/node:v1.35-fedora-44-disk"
+	DefaultNodeImage = "ghcr.io/bootc-dev/bink/node:v1.36-fedora-44-disk"
 
 	DefaultBaseDisk              = "/images/disk.qcow2"
 	DefaultControlPlaneMemory    = 1900

node-images/fedora/Containerfile

@@ -1,6 +1,6 @@
 FROM quay.io/fedora/fedora-bootc:44 AS builder
 
-ARG KUBE_MINOR=1.35
+ARG KUBE_MINOR=1.36
 # Pin kernel to 6.19.x to work around a kernel 7.0 regression.
 # https://github.com/bootc-dev/bink/issues/52
 ARG KERNEL_VERSION=6.19.14-300.fc44
@@ -37,7 +37,11 @@ COPY --from=builder /target-rootfs/ /
 
 RUN passwd -d root
 RUN sed -i 's|"/opt/cni/bin"|"/var/lib/cni/bin"|g' /etc/crio/crio.conf && \
-    sed -i 's|"/opt/cni/net.d"|"/etc/cni/net.d"|g' /etc/crio/crio.conf
+    sed -i 's|"/opt/cni/net.d"|"/etc/cni/net.d"|g' /etc/crio/crio.conf && \
+    if [ -x /usr/libexec/crio/pinns ]; then \
+        mkdir -p /etc/crio/crio.conf.d && \
+        printf '[crio.runtime]\npinns_path = "/usr/libexec/crio/pinns"\n' > /etc/crio/crio.conf.d/04-pinns.conf; \
+    fi
 RUN bootc container lint
 
 LABEL containers.bootc 1

node-images/fedora/Containerfile.disk

@@ -42,7 +42,7 @@ RUN mkdir -p /output ${LOG_DIR} && \
 RUN podman run --rm ${BOOTC_IMAGE} kubeadm config images list > /output/images.txt
 
 FROM scratch
-ARG KUBE_MINOR=1.35
+ARG KUBE_MINOR=1.36
 ARG BOOTC_IMAGE
 ARG BOOTC_DIGEST
 LABEL bink.kubeadm-version=${KUBE_MINOR}

node-images/fedora/Makefile

@@ -1,6 +1,6 @@
 .PHONY: build-bootc-image build-disk-image build-disk-image-composefs clean help
 
-KUBE_MINOR ?= 1.35
+KUBE_MINOR ?= 1.36
 FEDORA_VERSION ?= 44
 DISK_SIZE ?= 10G
 BUILD_MEMORY ?= 4G