Skip to content

Commit 0862e5e

Browse files
committed
Remove Ubuntu 20.04 as end of life
Signed-off-by: Marcus Noble <[email protected]>
1 parent 380687a commit 0862e5e

37 files changed

+56
-354
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
3333
- If the AWS CLI is already installed on your machine, you can simply mount the `~/.aws` folder that stores all the required credentials.
3434

3535
```commandline
36-
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
36+
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
3737
```
3838
- Another alternative is to use an `aws-creds.env` file to load the credentials and pass it during docker run.
3939
@@ -44,7 +44,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
4444
```
4545
4646
```commandline
47-
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
47+
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
4848
```
4949
5050
- AZURE
@@ -58,7 +58,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
5858
```
5959
6060
```commandline
61-
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
61+
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
6262
```
6363
6464
- Proxmox
@@ -90,7 +90,7 @@ docker pull registry.k8s.io/scl-image-builder/cluster-node-image-builder-amd64:v
9090
- 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.
9191
9292
```commandline
93-
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
93+
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
9494
```
9595
9696
In addition to this, further customizations can be done as discussed [here](./capi.md#customization).

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ the different operating systems.
2626

2727
| File | Description |
2828
|------|-------------|
29-
| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
3029
| `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
3130
| `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
3231

@@ -37,5 +36,5 @@ Please set the following environment variables before building image:
3736
OSC_SECRET_KEY: Outscale Secret Key
3837
OSC_REGION: Outscale Region
3938
OSC_ACCESS_KEY: Outscale Access Key Id
40-
OSC_ACCOUNT_ID: Outscale Account Id
39+
OSC_ACCOUNT_ID: Outscale Account Id
4140
```

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ the different operating systems.
4545
| `flatcar-arm64.json` | The settings for the Flatcar arm64 image |
4646
| `rhel-8.json` | The settings for the RHEL 8 image |
4747
| `rockylinux.json` | The settings for the Rocky Linux image |
48-
| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
4948
| `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
5049
| `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |
5150
| `windows-2019.json` | The settings for the Windows 2019 image |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ Generation 2 images may only be used with Shared Image Gallery, not VHD.
4747
Confidential VMs require specific generation 2 OS images. The naming pattern of those images includes the suffix `-cvm`. For example:
4848

4949
```bash
50-
# Ubuntu 20.04 LTS for Confidential VMs
51-
make build-azure-sig-ubuntu-2004-cvm
50+
# Ubuntu 24.04 LTS for Confidential VMs
51+
make build-azure-sig-ubuntu-2404-cvm
5252

5353
# Windows 2019 with containerd for Confindential VMs
5454
make build-azure-sig-windows-2019-containerd-cvm

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

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ $ sudo -i
1717
# apt install qemu-kvm libvirt-bin qemu-utils
1818
```
1919

20-
If you're on Ubuntu 20.04 LTS, then execute the following command to install qemu-kvm packages.
21-
22-
```bash
23-
$ sudo -i
24-
# apt install qemu-kvm libvirt-daemon-system libvirt-clients virtinst cpu-checker libguestfs-tools libosinfo-bin
25-
```
26-
2720
#### Adding your user to the kvm group
2821

2922
```bash
@@ -47,7 +40,7 @@ $ make deps-qemu
4740

4841
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.
4942

50-
For building a ubuntu-2004 based CAPI image, run the following commands -
43+
For building a ubuntu-2404 based CAPI image, run the following commands -
5144

5245
```bash
5346
$ git clone https://github.com/kubernetes-sigs/image-builder.git
@@ -57,7 +50,7 @@ $ cat > extra_vars.json <<EOF
5750
"ansible_user_vars": "provider=cloudstack"
5851
}
5952
EOF
60-
$ PACKER_VAR_FILES=extra_vars.json make clean build-qemu-ubuntu-2004
53+
$ PACKER_VAR_FILES=extra_vars.json make clean build-qemu-ubuntu-2404
6154
```
6255

6356
### XenServer Hypervisor
@@ -69,26 +62,26 @@ $ ./hack/ensure-vhdutil.sh
6962

7063
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 :
7164
```bash
72-
$ make build-qemu-ubuntu-2004
65+
$ make build-qemu-ubuntu-2404
7366
.............................
7467
Builds finished. The artifacts of successful builds are:
75-
qemu: VM files in directory: ./output/ubuntu-2004-kube-v1.21.10
68+
qemu: VM files in directory: ./output/ubuntu-2404-kube-v1.21.10
7669
```
77-
Here the build-name is `ubuntu-2004-kube-v1.21.10`
70+
Here the build-name is `ubuntu-2404-kube-v1.21.10`
7871

7972
One completed, run the following commands to convert the template to a XenServer compatible template
8073

8174
```bash
8275
$ ./hack/convert-cloudstack-image.sh ./output/<build-name>/<build-name> x
8376

84-
Creating XenServer Export for ubuntu-2004-kube-v1.21.10
77+
Creating XenServer Export for ubuntu-2404-kube-v1.21.10
8578
NOTE: For better performance, we will do the overwritten convert!
86-
Done! Convert to ubuntu-2004-kube-v1.21.10.vhd.
87-
Back up source to ubuntu-2004-kube-v1.21.10.vhd.bak.
88-
Converting to ubuntu-2004-kube-v1.21.10-xen.vhd.
79+
Done! Convert to ubuntu-2404-kube-v1.21.10.vhd.
80+
Back up source to ubuntu-2404-kube-v1.21.10.vhd.bak.
81+
Converting to ubuntu-2404-kube-v1.21.10-xen.vhd.
8982
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Done!
9083
Created .vhd file, now zipping
91-
ubuntu-2004-kube-v1.21.10 exported for XenServer: ubuntu-2004-kube-v1.21.10-xen.vhd.bz2
84+
ubuntu-2404-kube-v1.21.10 exported for XenServer: ubuntu-2404-kube-v1.21.10-xen.vhd.bz2
9285
```
9386

9487
### VMware Hypervisor
@@ -100,23 +93,23 @@ $ ./hack/ensure-ovftool.sh
10093

10194
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 :
10295
```bash
103-
$ make build-qemu-ubuntu-2004
96+
$ make build-qemu-ubuntu-2404
10497
.............................
10598
Builds finished. The artifacts of successful builds are:
106-
qemu: VM files in directory: ./output/ubuntu-2004-kube-v1.21.10
99+
qemu: VM files in directory: ./output/ubuntu-2404-kube-v1.21.10
107100
```
108-
Here the build-name is `ubuntu-2004-kube-v1.21.10`
101+
Here the build-name is `ubuntu-2404-kube-v1.21.10`
109102

110103
One completed, run the following commands to convert the template to a VMware compatible template
111104

112105
```bash
113106
$ ./hack/convert-cloudstack-image.sh ./output/<build-name>/<build-name> v
114107

115-
Creating VMware Export for ubuntu-2004-kube-v1.21.10
108+
Creating VMware Export for ubuntu-2404-kube-v1.21.10
116109
/usr/bin/ovftool: line 10: warning: setlocale: LC_CTYPE: cannot change locale (en_US.UTF-8): No such file or directory
117-
Opening VMX source: ubuntu-2004-kube-v1.21.10-vmware.vmx
118-
Opening OVA target: ubuntu-2004-kube-v1.21.10-vmware.ova
119-
Writing OVA package: ubuntu-2004-kube-v1.21.10-vmware.ova
110+
Opening VMX source: ubuntu-2404-kube-v1.21.10-vmware.vmx
111+
Opening OVA target: ubuntu-2404-kube-v1.21.10-vmware.ova
112+
Writing OVA package: ubuntu-2404-kube-v1.21.10-vmware.ova
120113
Transfer Completed
121114
Completed successfully
122115
```

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@ the different operating systems.
2525

2626
| File | Description |
2727
|------|-------------|
28-
| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
2928
| `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
3029
| `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ the different operating systems.
2828
| `flatcar-arm64.json` | The settings for the Flatcar arm64 image |
2929
| `rockylinux-8.json` | The settings for the RockyLinux 8 image |
3030
| `rockylinux-9.json` | The settings for the RockyLinux 9 image |
31-
| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
3231
| `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
3332
| `ubuntu-2404.json` | The settings for the Ubuntu 24.04 image |

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This table lists several common options that a user may want to set via `PACKER_
5959
The parameters can be set via a variable file and passed via `PACKER_VAR_FILES`. See [Customization](../capi.md#customization) for examples.
6060

6161

62-
> **Note:**
62+
> **Note:**
6363
> 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.
6464
> 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.
6565
@@ -80,13 +80,6 @@ $ sudo -i
8080
# apt install qemu-kvm libvirt-bin qemu-utils
8181
```
8282

83-
If you're on Ubuntu 20.04 LTS, then execute the following command to install qemu-kvm packages.
84-
85-
```bash
86-
$ sudo -i
87-
# apt install qemu-kvm libvirt-daemon-system libvirt-clients virtinst cpu-checker libguestfs-tools libosinfo-bin
88-
```
89-
9083
#### Adding your user to the kvm group
9184

9285
```bash
@@ -107,14 +100,14 @@ make deps-qemu
107100

108101
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.
109102

110-
For building a ubuntu-2004 based CAPI image, run the following commands -
103+
For building a ubuntu-2404 based CAPI image, run the following commands -
111104

112105
```bash
113106
$ git clone https://github.com/kubernetes-sigs/image-builder.git
114107
$ cd image-builder/images/capi/
115-
$ make build-qemu-ubuntu-2004
108+
$ make build-qemu-ubuntu-2404
116109
```
117110

118111
#### Customizing Build
119112

120-
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.
113+
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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $ make deps-nutanix
1313

1414
## Configure the Nutanix builder
1515

16-
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.
16+
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.
1717
This file have the following format:
1818

1919
```
@@ -32,12 +32,12 @@ This file have the following format:
3232

3333
Corresponding env variables
3434

35-
`NUTANIX_ENDPOINT`
36-
`NUTANIX_PORT`
37-
`NUTANIX_INSECURE`
38-
`NUTANIX_USERNAME`
39-
`NUTANIX_PASSWORD`
40-
`NUTANIX_CLUSTER_NAME`
35+
`NUTANIX_ENDPOINT`
36+
`NUTANIX_PORT`
37+
`NUTANIX_INSECURE`
38+
`NUTANIX_USERNAME`
39+
`NUTANIX_PASSWORD`
40+
`NUTANIX_CLUSTER_NAME`
4141
`NUTANIX_SUBNET_NAME`
4242

4343

@@ -88,7 +88,6 @@ The `nutanix` sub-directory inside `images/capi/packer` stores JSON configuratio
8888

8989
| File | Description |
9090
|---------------------|-----------------------------------------------|
91-
| `ubuntu-2004.json` | Settings for Ubuntu 20.04 image |
9291
| `ubuntu-2204.json` | Settings for Ubuntu 22.04 image |
9392
| `rockylinux-8.json` | Settings for Rocky Linux 8 image (UEFI) |
9493
| `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
109108
PACKER_FLAGS=-on-error=ask RHSM_USER=user RHSM_PASS=pass make build-nutanix-rhel-9
110109
```
111110

112-
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.
111+
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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ the different operating systems.
2828
|------|-------------|
2929
| `oracle-linux-8.json` | The settings for the Oracle Linux 8 image |
3030
| `oracle-linux-9.json` | The settings for the Oracle Linux 9 image |
31-
| `ubuntu-1804.json` | The settings for the Ubuntu 18.04 image |
32-
| `ubuntu-2004.json` | The settings for the Ubuntu 20.04 image |
3331
| `ubuntu-2204.json` | The settings for the Ubuntu 22.04 image |
3432
| `windows-2019.json` | The settings for the Windows Server 2019 image |
3533
| `windows-2022.json` | The settings for the Windows Server 2022 image |

0 commit comments

Comments
 (0)