Fix Ubuntu 26.04 Azure build: drop stale Microsoft 18.04 apt source

.github/workflows/build-azure-sig.yaml

@@ -132,7 +132,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Configure Kubernetes version
         uses: ./.github/actions/configure-k8s-version
@@ -287,7 +287,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Download publishing info artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -646,7 +646,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Download publishing info artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -799,7 +799,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
 
       - name: Download publishing info artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1

Makefile

@@ -34,4 +34,6 @@ update-release-docs: ## Updates the docs with reference to the latest release ve
 	images/capi/scripts/release-update-docs.sh
 
 .DEFAULT:
-	$(MAKE) -C images/capi $@
+	@$(if $(or $(findstring ',$@),$(findstring \,$@)),$(error Invalid target name: $@))
+	@case '$@' in *[!a-zA-Z0-9_./-]*) echo 'Invalid target name' >&2; exit 1 ;; esac
+	@$(MAKE) -C images/capi '$@'

OWNERS_ALIASES

@@ -24,8 +24,7 @@ aliases:
     - yadvr
   image-builder-scaleway-reviewers:
     - Tomy2e
-    - Mia-Cross
-    - remyleone
+    - pablo-ruth
   image-builder-raw-maintainers:
     - detiber
     - thebsdbox

README.md

@@ -20,25 +20,26 @@ The table below shows the currently provided operating systems for each provider
 - ✅: Image is available for the provider
 - ❌: Image is not available for the provider
 
-| OS                | ami | azure | digitalocean | gce | hcloud | huaweicloud | maas | nutanix | oci | openstack | outscale | ova | powervs | proxmox | qemu | raw | scaleway | vultr |
-|-------------------|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|
-| AlmaLinux 9       | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Amazon Linux 2    | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Amazon Linux 2023 | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Azure Linux 3     | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| CentOS 9          | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ |
-| Flatcar           | ✅ | 💙 | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ✅ | ❌ | 💙 | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ |
-| Oracle Linux 9    | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Photon 4          | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Photon 5          | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| RHEL 9            | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
-| Rocky Linux 9     | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ✅ | ❌ | 💙 | ❌ | ✅ | ✅ | ❌ | ✅ | ❌ |
-| Ubuntu 22.04      | ✅ | 💙 | ✅ | 💙 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | 💙 | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| Ubuntu 24.04      | ✅ | 💙 | ✅ | 💙 | ✅ | ❌ | ✅ | ✅ | ❌ | ✅ | ✅ | 💙 | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
-| Windows 2019      | ✅ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Windows 2022      | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Windows 2025      | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
-| Windows Annual    | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| OS                | ami | azure | digitalocean | gce | hcloud | huaweicloud | maas | nutanix | oci | openstack | outscale | ova | oxide | powervs | proxmox | qemu | raw | scaleway | vultr |
+|-------------------|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|
+| AlmaLinux 9       | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Amazon Linux 2    | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Amazon Linux 2023 | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Azure Linux 3     | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| CentOS 9          | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ✅ | ❌ | ❌ | ❌ |
+| Flatcar           | ✅ | 💙 | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ✅ | ❌ | 💙 | ❌ | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ |
+| Oracle Linux 9    | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Photon 4          | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Photon 5          | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| RHEL 9            | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
+| Rocky Linux 9     | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ✅ | ❌ | 💙 | ❌ | ❌ | ✅ | ✅ | ❌ | ✅ | ❌ |
+| Ubuntu 22.04      | ✅ | 💙 | ✅ | 💙 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | 💙 | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
+| Ubuntu 24.04      | ✅ | 💙 | ✅ | 💙 | ✅ | ❌ | ✅ | ✅ | ❌ | ✅ | ✅ | 💙 | ✅ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
+| Ubuntu 26.04      | ✅ | 💙 | ✅ | 💙 | ✅ | ❌ | ✅ | ✅ | ❌ | ✅ | ✅ | 💙 | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ |
+| Windows 2019      | ✅ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Windows 2022      | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Windows 2025      | ❌ | 💙 | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| Windows Annual    | ❌ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
 
 ## Community, discussion, contribution, and support
 

RELEASE.md

@@ -1,11 +1,11 @@
 # Image Builder Releases
 
-The current release of Image Builder is [v0.1.50][] (April 1, 2026). The corresponding container image is `registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.50`.
+The current release of Image Builder is [v0.1.52][] (April 1, 2026). The corresponding container image is `registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.52`.
 
 ## Release Process
 
 For more detail about image-builder project releases, see the [Image Builder Book][].
 
 
-[v0.1.50]: https://github.com/kubernetes-sigs/image-builder/releases/tag/v0.1.50
+[v0.1.52]: https://github.com/kubernetes-sigs/image-builder/releases/tag/v0.1.52
 [Image Builder Book]: https://image-builder.sigs.k8s.io/capi/releasing.html

cloudbuild.yaml

@@ -3,7 +3,7 @@ timeout: 3000s
 options:
   substitution_option: ALLOW_LOOSE
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:63840f133e0dfeea0af9ef391210da7fab9d2676172e2967fccab0cd6110c4e7' # v20250513-9264efb079
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud@sha256:ff388e0dc16351e96f8464e2e185b74a7578a5ccb7a112cf3393468e59e6e2d2' # v20260205-38cfa9523f
     entrypoint: make
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled

docs/book/src/SUMMARY.md

@@ -16,6 +16,7 @@
   - [OpenStack](./capi/providers/openstack.md)
   - [OpenStack remote image building](./capi/providers/openstack-remote.md)
   - [OCI](./capi/providers/oci.md)
+  - [Oxide](./capi/providers/oxide.md)
   - [raw](./capi/providers/raw.md)
   - [Scaleway](./capi/providers/scaleway.md)
   - [vSphere](./capi/providers/vsphere.md)

docs/book/src/capi/container-image.md

@@ -18,7 +18,7 @@ Run the docker build target of Makefile
 The latest image-builder container image release is available here:
 
 ```commandline
-docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.50
+docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.52
 ```
 
 ### Examples
@@ -27,7 +27,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
     - If the AWS CLI is already installed on your machine, you can simply mount the `~/.aws` folder that stores all the required credentials.
 
     ```commandline
-    docker run -it --rm -v /Users/<user>/.aws:/home/imagebuilder/.aws registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.50 build-ami-ubuntu-2404
+    docker run -it --rm -v /Users/<user>/.aws:/home/imagebuilder/.aws registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.52 build-ami-ubuntu-2404
     ```
     - Another alternative is to use an `aws-creds.env` file to load the credentials and pass it during docker run.
 
@@ -37,7 +37,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
       ```
 
     ```commandline
-        docker run -it --rm --env-file aws-creds.env registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.50 build-ami-ubuntu-2404
+        docker run -it --rm --env-file aws-creds.env registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.52 build-ami-ubuntu-2404
     ```
 
 - AZURE
@@ -51,7 +51,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
       ```
 
     ```commandline
-    docker run -it --rm --env-file az-creds.env registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.50 build-azure-sig-ubuntu-2404
+    docker run -it --rm --env-file az-creds.env registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.52 build-azure-sig-ubuntu-2404
     ```
 
 - Proxmox
@@ -83,7 +83,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
     - Docker's `--net=host` option to ensure http server starts with the host IP and not the Docker container IP. This option is Linux specific and thus implies that it can be run only from a Linux machine.
 
     ```commandline
-    docker run -it --rm --net=host --env PACKER_VAR_FILES=/home/imagebuilder/vsphere.json -v <complete path of vsphere.json>:/home/imagebuilder/vsphere.json registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.50 build-node-ova-vsphere-ubuntu-2404
+    docker run -it --rm --net=host --env PACKER_VAR_FILES=/home/imagebuilder/vsphere.json -v <complete path of vsphere.json>:/home/imagebuilder/vsphere.json registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.52 build-node-ova-vsphere-ubuntu-2404
     ```
 
 In addition to this, further customizations can be done as discussed [here](./capi.md#customization).

docs/book/src/capi/containerd/customizing-containerd.md

@@ -84,3 +84,11 @@ You can also add further configuration by adding values for `containerd_addition
 end of the
 [`config.toml`](https://github.com/kubernetes-sigs/image-builder/blob/main/images/capi/ansible/roles/containerd/templates/etc/containerd/config.toml#L86)
 default template. 
+
+## Overriding `LimitNOFILE`
+
+By default a `LimitNOFILE` systemd drop-in (capping the value at `1048576`) is only deployed on
+Common Base Linux Mariner, Flatcar, and Microsoft Azure Linux, where the upstream `infinity` value
+has been known to cause issues with some containerized software. To opt-in to deploying the same
+drop-in on other operating systems, set `containerd_enable_limit_no_file` to `true`. It defaults to
+`false`.

docs/book/src/capi/providers/3dsoutscale.md

@@ -28,6 +28,7 @@ the different operating systems.
 |------|-------------|
 | `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
 | `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
+| `ubuntu-2604.json` | The settings for the Ubuntu 26.04 image |
 
 You must have your [Access Keys](https://docs.outscale.com/en/userguide/About-Access-Keys.html).
 You must have your [Account Id](https://docs.outscale.com/en/userguide/Getting-Information-About-Your-Account-and-Quotas.html).

docs/book/src/capi/providers/aws.md

@@ -46,6 +46,7 @@ the different operating systems.
 | `rockylinux.json`    | The settings for the Rocky Linux image    |
 | `ubuntu-2204.json`   | The settings for the Ubuntu 22.04 image   |
 | `ubuntu-2404.json`   | The settings for the Ubuntu 24.04 image   |
+| `ubuntu-2604.json`   | The settings for the Ubuntu 26.04 image   |
 | `windows-2019.json`  | The settings for the Windows 2019 image   |
 
 

docs/book/src/capi/providers/azure.md

@@ -7,7 +7,7 @@ These images are designed for use with [Cluster API Provider Azure](https://capz
 - An Azure account
 - The Azure CLI installed and configured
 - Set environment variables for `AZURE_SUBSCRIPTION_ID`, `AZURE_CLIENT_ID`, `AZURE_CLIENT_SECRET`
-- Set optional environment variables `RESOURCE_GROUP_NAME`, `BUILD_RESOURCE_GROUP_NAME`, `STORAGE_ACCOUNT_NAME`, `AZURE_LOCATION` & `GALLERY_NAME` to override the default values
+- Set optional environment variables `RESOURCE_GROUP_NAME`, `BUILD_RESOURCE_GROUP_NAME`, `AZURE_LOCATION` & `GALLERY_NAME` to override the default values
 
 ## Building Images
 
@@ -20,11 +20,7 @@ make deps-azure
 
 ### Building Managed Images in Shared Image Galleries
 
-From the `images/capi` directory, run `make build-azure-sig-ubuntu-1804`
-
-### Building VHDs
-
-From the `images/capi` directory, run `make build-azure-vhd-ubuntu-1804`
+From the `images/capi` directory, run `make build-azure-sig-ubuntu-2204`
 
 > If building the Windows images from a Mac there is a known issue with connectivity. Please see details on running [macOS with ansible](../windows/windows.md#macos-with-ansible).
 
@@ -34,14 +30,12 @@ Most of the images built from the `images/capi` directory for Azure will be Hype
 
 ```bash
 # Generation 1 image
-make build-azure-sig-ubuntu-1804
+make build-azure-sig-ubuntu-2204
 
 # Generation 2 image
-make build-azure-sig-ubuntu-1804-gen2
+make build-azure-sig-ubuntu-2204-gen2
 ```
 
-Generation 2 images may only be used with Shared Image Gallery, not VHD.
-
 ### Confidential VM Images
 
 Confidential VMs require specific generation 2 OS images. The naming pattern of those images includes the suffix `-cvm`. For example:
@@ -76,15 +70,6 @@ list, and greater explanation can be found in the
 
 If you are adding features to image builder than it is sometimes useful to work with the images directly. This section gives some tips.
 
-### Provision a VM directly from a VHD
-
-After creating a VHD, create a managed image using the url output from `make build-azure-vhd-<image>` and use it to [create the VM](https://learn.microsoft.com/azure/virtual-machines/windows/build-image-with-packer#create-a-vm-from-the-packer-image):
-
-```bash
-az image create -n testvmimage -g cluster-api-images --os-type <Windows/Linux> --source <storage url for vhd file>
-az vm create -n testvm --image testvmimage -g cluster-api-images
-```
-
 ### Debugging Packer scripts
 There are several ways to debug Packer scripts: https://developer.hashicorp.com/packer/docs/debugging
 

docs/book/src/capi/providers/digitalocean.md

@@ -27,3 +27,4 @@ the different operating systems.
 |------|-------------|
 | `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
 | `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
+| `ubuntu-2604.json` | The settings for the Ubuntu 26.04 image |

docs/book/src/capi/providers/gcp.md

@@ -50,6 +50,7 @@ The `gce` sub-directory inside `images/capi/packer` stores JSON configuration fi
 | -------- | --------
 | `ubuntu-2204.json`     | Settings for Ubuntu 22.04 image     |
 | `ubuntu-2404.json`     | Settings for Ubuntu 24.04 image     |
+| `ubuntu-2604.json`     | Settings for Ubuntu 26.04 image     |
 
 #### Common GCP options
 

docs/book/src/capi/providers/hcloud.md

@@ -29,3 +29,4 @@ the different operating systems.
 | `rockylinux-9.json`  | The settings for the RockyLinux 9 image  |
 | `ubuntu-2204.json`   | The settings for the Ubuntu 22.04 image  |
 | `ubuntu-2404.json`   | The settings for the Ubuntu 24.04 image  |
+| `ubuntu-2604.json`   | The settings for the Ubuntu 26.04 image  |

docs/book/src/capi/providers/maas.md

@@ -19,7 +19,7 @@ From the `image-builder` directory, run:
 make build-maas-ubuntu-xxxx-efi
 ```
 
-The image will be located in `images/capi/output/BUILD_NAME+kube-KUBERNETES_VERSION`. Replace `xxxx` with `2204` or `2404`, depending on the Ubuntu version.
+The image will be located in `images/capi/output/BUILD_NAME+kube-KUBERNETES_VERSION`. Replace `xxxx` with `2204`, `2404` or `2604`, depending on the Ubuntu version.
 
 To build a Ubuntu 22.04-based CAPI image:
 
@@ -73,7 +73,7 @@ Use the **.tar.gz** file for the upload:
 maas admin boot-resources create name=custom/your-image architecture=amd64/generic title=your-image subarches=generic base_image=ubuntu/jammy content@=./ubuntu-2204-efi-kube-v1.30.5.tar.gz
 ```
 
-**Note:** Set `base_image=ubuntu/jammy` for Ubuntu 22.04 or `ubuntu/noble` for 24.04.
+**Note:** Set `base_image=ubuntu/jammy` for Ubuntu 22.04, `ubuntu/noble` for 24.04, or `ubuntu/resolute` for 26.04.
 
 ## Custom Curtin Scripts
 If you need to override the default MaaS curtin scripts, create a custom role containing the curtin hooks. The files must be copied to the `/curtin` directory

docs/book/src/capi/providers/oxide.md

@@ -0,0 +1,30 @@
+# Building Images for Oxide
+
+## Prerequisites for Oxide
+
+- Credentials for an Oxide rack, configured via either `OXIDE_PROFILE` or `OXIDE_HOST`/`OXIDE_TOKEN` in the environment.
+- The following environment variables set:
+
+  | Variable | Description |
+  |----------|-------------|
+  | `OXIDE_PROJECT` | Name or ID of the Oxide project to build the image in. |
+  | `OXIDE_BOOT_DISK_IMAGE_ID` | UUID of the image to use as the build source. |
+
+## Building Images
+
+The build [prerequisites](../capi.md#prerequisites) for using `image-builder` for
+building Oxide images are managed by running:
+
+```bash
+make deps-oxide
+```
+
+From the `images/capi` directory, run `make build-oxide-<OS>` where `<OS>` is the desired operating system. The available choices are listed via `make help`.
+
+### Configuration
+
+In addition to the configuration found in `images/capi/packer/config`, the `oxide` directory includes per-OS JSON files that define defaults for each supported image:
+
+| File | Description |
+|------|-------------|
+| `ubuntu-2404.json` | Settings for the Ubuntu 24.04 image |

docs/book/src/capi/providers/proxmox.md

@@ -38,6 +38,7 @@ the different operating systems.
 |--------------------|-----------------------------------------|
 | `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
 | `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
+| `ubuntu-2604.json` | The settings for the Ubuntu 26.04 image |
 
 The full list of available environment vars can be found in the `variables` section of `images/capi/packer/proxmox/packer.json`.
 

docs/book/src/capi/providers/scaleway.md

@@ -27,3 +27,4 @@ the different operating systems.
 | `rockylinux-9.json` | The settings for the Rocky Linux 9 image |
 | `ubuntu-2204.json`  | The settings for the Ubuntu 22.04 image  |
 | `ubuntu-2404.json`  | The settings for the Ubuntu 24.04 image  |
+| `ubuntu-2604.json`  | The settings for the Ubuntu 26.04 image  |