Merge pull request #1793 from giantswarm/remove-ubuntu-2004

Remove Ubuntu 20.04 as end of life

Author: k8s-ci-robot

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

@@ -33,7 +33,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.45 build-ami-ubuntu-2004
+    docker run -it --rm -v /Users/<user>/.aws:/home/imagebuilder/.aws registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.45 build-ami-ubuntu-2404
     ```
     - Another alternative is to use an `aws-creds.env` file to load the credentials and pass it during docker run.
 
@@ -44,7 +44,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.45 build-ami-ubuntu-2004
+        docker run -it --rm --env-file aws-creds.env registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.45 build-ami-ubuntu-2404
     ```
 
 - AZURE
@@ -58,7 +58,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.45 build-azure-sig-ubuntu-2004
+    docker run -it --rm --env-file az-creds.env registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v0.1.45 build-azure-sig-ubuntu-2404
     ```
 
 - Proxmox
@@ -90,7 +90,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.45 build-node-ova-vsphere-ubuntu-2004
+    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.45 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/providers/3dsoutscale.md

@@ -26,7 +26,6 @@ the different operating systems.
 
 | File | Description |
 |------|-------------|
-| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
 | `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
 | `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
 
@@ -37,5 +36,5 @@ Please set the following environment variables before building image:
 OSC_SECRET_KEY: Outscale Secret Key
 OSC_REGION: Outscale Region
 OSC_ACCESS_KEY: Outscale Access Key Id
-OSC_ACCOUNT_ID: Outscale Account Id 
+OSC_ACCOUNT_ID: Outscale Account Id
 ```

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

@@ -45,7 +45,6 @@ the different operating systems.
 | `flatcar-arm64.json` | The settings for the Flatcar arm64 image  |
 | `rhel-8.json`        | The settings for the RHEL 8 image         |
 | `rockylinux.json`    | The settings for the Rocky Linux image    |
-| `ubuntu-2004.json`   | The settings for the Ubuntu 20.04 image   |
 | `ubuntu-2204.json`   | The settings for the Ubuntu 22.04 image   |
 | `ubuntu-2404.json`   | The settings for the Ubuntu 24.04 image   |
 | `windows-2019.json`  | The settings for the Windows 2019 image   |

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

@@ -47,8 +47,8 @@ Generation 2 images may only be used with Shared Image Gallery, not VHD.
 Confidential VMs require specific generation 2 OS images. The naming pattern of those images includes the suffix `-cvm`. For example:
 
 ```bash
-# Ubuntu 20.04 LTS for Confidential VMs
-make build-azure-sig-ubuntu-2004-cvm
+# Ubuntu 24.04 LTS for Confidential VMs
+make build-azure-sig-ubuntu-2404-cvm
 
 # Windows 2019 with containerd for Confindential VMs
 make build-azure-sig-windows-2019-containerd-cvm

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

@@ -17,13 +17,6 @@ $ sudo -i
 # apt install qemu-kvm libvirt-bin qemu-utils
 ```
 
-If you're on Ubuntu 20.04 LTS, then execute the following command to install qemu-kvm packages.
-
-```bash
-$ sudo -i
-# apt install qemu-kvm libvirt-daemon-system libvirt-clients virtinst cpu-checker libguestfs-tools libosinfo-bin
-```
-
 #### Adding your user to the kvm group
 
 ```bash
@@ -47,7 +40,7 @@ $ make deps-qemu
 
 From the `images/capi` directory, run `make build-qemu-xxxx-yyyy`. The image is built and located in images/capi/output/BUILD_NAME+kube-KUBERNETES_VERSION. Please replace xxxx with the OS distribution and yyyy with the OS version depending on WHAT you want to build the image for.
 
-For building a ubuntu-2004 based CAPI image, run the following commands -
+For building a ubuntu-2404 based CAPI image, run the following commands -
 
 ```bash
 $ git clone https://github.com/kubernetes-sigs/image-builder.git
@@ -57,7 +50,7 @@ $ cat > extra_vars.json <<EOF
   "ansible_user_vars": "provider=cloudstack"
 }
 EOF
-$ PACKER_VAR_FILES=extra_vars.json make clean build-qemu-ubuntu-2004
+$ PACKER_VAR_FILES=extra_vars.json make clean build-qemu-ubuntu-2404
 ```
 
 ### XenServer Hypervisor
@@ -69,26 +62,26 @@ $ ./hack/ensure-vhdutil.sh
 
 Follow the preceding steps to build the qcow2 CAPI template for KVM. It will display the location of the template to the terminal as shown :
 ```bash
-$ make build-qemu-ubuntu-2004
+$ make build-qemu-ubuntu-2404
 .............................
 Builds finished. The artifacts of successful builds are:
-qemu: VM files in directory: ./output/ubuntu-2004-kube-v1.21.10
+qemu: VM files in directory: ./output/ubuntu-2404-kube-v1.21.10
 ```
-Here the build-name is `ubuntu-2004-kube-v1.21.10`
+Here the build-name is `ubuntu-2404-kube-v1.21.10`
 
 One completed, run the following commands to convert the template to a XenServer compatible template
 
 ```bash
 $ ./hack/convert-cloudstack-image.sh ./output/<build-name>/<build-name> x
 
-Creating XenServer Export for ubuntu-2004-kube-v1.21.10
+Creating XenServer Export for ubuntu-2404-kube-v1.21.10
 NOTE: For better performance, we will do the overwritten convert!
-Done! Convert to ubuntu-2004-kube-v1.21.10.vhd.
-Back up source to ubuntu-2004-kube-v1.21.10.vhd.bak.
-Converting to ubuntu-2004-kube-v1.21.10-xen.vhd.
+Done! Convert to ubuntu-2404-kube-v1.21.10.vhd.
+Back up source to ubuntu-2404-kube-v1.21.10.vhd.bak.
+Converting to ubuntu-2404-kube-v1.21.10-xen.vhd.
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Done!
 Created .vhd file, now zipping
-ubuntu-2004-kube-v1.21.10 exported for XenServer: ubuntu-2004-kube-v1.21.10-xen.vhd.bz2
+ubuntu-2404-kube-v1.21.10 exported for XenServer: ubuntu-2404-kube-v1.21.10-xen.vhd.bz2
 ```
 
 ### VMware Hypervisor
@@ -100,23 +93,23 @@ $ ./hack/ensure-ovftool.sh
 
 Follow the preceding steps to build the qcow2 CAPI template for KVM. It will display the location of the template to the terminal as shown :
 ```bash
-$ make build-qemu-ubuntu-2004
+$ make build-qemu-ubuntu-2404
 .............................
 Builds finished. The artifacts of successful builds are:
-qemu: VM files in directory: ./output/ubuntu-2004-kube-v1.21.10
+qemu: VM files in directory: ./output/ubuntu-2404-kube-v1.21.10
 ```
-Here the build-name is `ubuntu-2004-kube-v1.21.10`
+Here the build-name is `ubuntu-2404-kube-v1.21.10`
 
 One completed, run the following commands to convert the template to a VMware compatible template
 
 ```bash
 $ ./hack/convert-cloudstack-image.sh ./output/<build-name>/<build-name> v
 
-Creating VMware Export for ubuntu-2004-kube-v1.21.10
+Creating VMware Export for ubuntu-2404-kube-v1.21.10
 /usr/bin/ovftool: line 10: warning: setlocale: LC_CTYPE: cannot change locale (en_US.UTF-8): No such file or directory
-Opening VMX source: ubuntu-2004-kube-v1.21.10-vmware.vmx
-Opening OVA target: ubuntu-2004-kube-v1.21.10-vmware.ova
-Writing OVA package: ubuntu-2004-kube-v1.21.10-vmware.ova
+Opening VMX source: ubuntu-2404-kube-v1.21.10-vmware.vmx
+Opening OVA target: ubuntu-2404-kube-v1.21.10-vmware.ova
+Writing OVA package: ubuntu-2404-kube-v1.21.10-vmware.ova
 Transfer Completed
 Completed successfully
 ```

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

@@ -25,6 +25,5 @@ the different operating systems.
 
 | File | Description |
 |------|-------------|
-| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
 | `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
 | `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |

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

@@ -28,6 +28,5 @@ the different operating systems.
 | `flatcar-arm64.json` | The settings for the Flatcar arm64 image |
 | `rockylinux-8.json`  | The settings for the RockyLinux 8 image  |
 | `rockylinux-9.json`  | The settings for the RockyLinux 9 image  |
-| `ubuntu-2004.json`   | The settings for the Ubuntu 20.04 image  |
 | `ubuntu-2204.json`   | The settings for the Ubuntu 22.04 image  |
 | `ubuntu-2404.json`   | The settings for the Ubuntu 24.04 image  |

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

@@ -59,7 +59,7 @@ This table lists several common options that a user may want to set via `PACKER_
 The parameters can be set via a variable file and passed via `PACKER_VAR_FILES`. See [Customization](../capi.md#customization) for examples.
 
 
-> **Note:** 
+> **Note:**
 > 1. When setting `dhcp_network: true`, you need to build an OS image with certain network settings using [pvsadm tool](https://github.com/ppc64le-cloud/pvsadm/blob/main/docs/Build%20DHCP%20enabled%20Centos%20Images.md) and replace [the fields](https://github.com/kubernetes-sigs/image-builder/blob/cb925047f388090a0db3430ca3172da63eff952c/images/capi/packer/powervs/centos-8.json#L6) with the custom image details.
 > 2. Clone the image-builder repo and run `make build` commands from a system where the DHCP private IP can be reached and SSH able.
 
@@ -80,13 +80,6 @@ $ sudo -i
 # apt install qemu-kvm libvirt-bin qemu-utils
 ```
 
-If you're on Ubuntu 20.04 LTS, then execute the following command to install qemu-kvm packages.
-
-```bash
-$ sudo -i
-# apt install qemu-kvm libvirt-daemon-system libvirt-clients virtinst cpu-checker libguestfs-tools libosinfo-bin
-```
-
 #### Adding your user to the kvm group
 
 ```bash
@@ -107,14 +100,14 @@ make deps-qemu
 
 From the `images/capi` directory, run `make build-qemu-ubuntu-xxxx`. The image is built and located in images/capi/output/{BUILD_NAME}-kube-{KUBERNETES_VERSION}. Please replace xxxx with `1804` or `2004` depending on the version you want to build the image for.
 
-For building a ubuntu-2004 based CAPI image, run the following commands -
+For building a ubuntu-2404 based CAPI image, run the following commands -
 
 ```bash
 $ git clone https://github.com/kubernetes-sigs/image-builder.git
 $ cd image-builder/images/capi/
-$ make build-qemu-ubuntu-2004
+$ make build-qemu-ubuntu-2404
 ```
 
 #### Customizing Build
 
-User may want to customize their build behavior. The parameters can be set via a variable file and passed via `PACKER_VAR_FILES`. See [Customization](../capi.md#customization) for examples.
+User may want to customize their build behavior. The parameters can be set via a variable file and passed via `PACKER_VAR_FILES`. See [Customization](../capi.md#customization) for examples.

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

@@ -13,7 +13,7 @@ $ make deps-nutanix
 
 ## Configure the Nutanix builder
 
-Modify the `packer/nutanix/nutanix.json` configuration file with credentials and informations specific to your Nutanix Prism Central used to build the image, you can also use the corresponding env variables.  
+Modify the `packer/nutanix/nutanix.json` configuration file with credentials and informations specific to your Nutanix Prism Central used to build the image, you can also use the corresponding env variables.
 This file have the following format:
 
 ```
@@ -32,12 +32,12 @@ This file have the following format:
 
 Corresponding env variables
 
-`NUTANIX_ENDPOINT`  
-`NUTANIX_PORT`  
-`NUTANIX_INSECURE`  
-`NUTANIX_USERNAME`  
-`NUTANIX_PASSWORD`  
-`NUTANIX_CLUSTER_NAME`  
+`NUTANIX_ENDPOINT`
+`NUTANIX_PORT`
+`NUTANIX_INSECURE`
+`NUTANIX_USERNAME`
+`NUTANIX_PASSWORD`
+`NUTANIX_CLUSTER_NAME`
 `NUTANIX_SUBNET_NAME`
 
 
@@ -88,7 +88,6 @@ The `nutanix` sub-directory inside `images/capi/packer` stores JSON configuratio
 
 | File                | Description                                   |
 |---------------------|-----------------------------------------------|
-| `ubuntu-2004.json`  | Settings for Ubuntu 20.04 image               |
 | `ubuntu-2204.json`  | Settings for Ubuntu 22.04 image               |
 | `rockylinux-8.json` | Settings for Rocky Linux 8 image (UEFI)       |
 | `rockylinux-9.json` | Settings for Rocky Linux 9 image              |
@@ -109,4 +108,4 @@ When building the RHEL image, the OS must register itself with the Red Hat Subsc
 PACKER_FLAGS=-on-error=ask RHSM_USER=user RHSM_PASS=pass make build-nutanix-rhel-9
 ```
 
-The addition of `PACKER_FLAGS=-on-error=ask` means that if an error is encountered, the build will pause, allowing you to SSH into the machine and unregister manually.
+The addition of `PACKER_FLAGS=-on-error=ask` means that if an error is encountered, the build will pause, allowing you to SSH into the machine and unregister manually.

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

@@ -28,8 +28,6 @@ the different operating systems.
 |------|-------------|
 | `oracle-linux-8.json` | The settings for the Oracle Linux 8 image |
 | `oracle-linux-9.json` | The settings for the Oracle Linux 9 image |
-| `ubuntu-1804.json` | The settings for the Ubuntu 18.04 image |
-| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
 | `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
 | `windows-2019.json` | The settings for the Windows Server 2019 image |
 | `windows-2022.json` | The settings for the Windows Server 2022 image |