From caf69ad2aa6b8f3d9f18ef1a6b23d8c802466090 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Fri, 2 Sep 2022 11:11:33 -0600 Subject: [PATCH] Add Ubuntu 22.04 LTS for Azure --- images/capi/Makefile | 8 +++++++- images/capi/azure_targets.sh | 6 +++--- images/capi/packer/azure/scripts/init-sig.sh | 6 ++++++ images/capi/packer/azure/ubuntu-2204-gen2.json | 9 +++++++++ images/capi/packer/azure/ubuntu-2204.json | 9 +++++++++ 5 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 images/capi/packer/azure/ubuntu-2204-gen2.json create mode 100644 images/capi/packer/azure/ubuntu-2204.json diff --git a/images/capi/Makefile b/images/capi/Makefile index 5dcb486cee..ac4acfc2d0 100644 --- a/images/capi/Makefile +++ b/images/capi/Makefile @@ -252,7 +252,7 @@ FLATCAR_VERSIONS := flatcar PHOTON_VERSIONS := photon-3 RHEL_VERSIONS := rhel-7 rhel-8 ROCKYLINUX_VERSIONS := rockylinux-8 -UBUNTU_VERSIONS := ubuntu-1804 ubuntu-2004 ubuntu-2004-efi +UBUNTU_VERSIONS := ubuntu-1804 ubuntu-2004 ubuntu-2004-efi ubuntu-2204 ubuntu-2204-efi WINDOWS_VERSIONS := windows-2019 windows-2004 windows-2022 # Set Flatcar Container Linux channel and version if not supplied @@ -495,6 +495,7 @@ build-ami-all: $(AMI_BUILD_TARGETS) ## Builds all AMIs build-azure-sig-ubuntu-1804: ## Builds Ubuntu 18.04 Azure managed image in Shared Image Gallery build-azure-sig-ubuntu-2004: ## Builds Ubuntu 20.04 Azure managed image in Shared Image Gallery +build-azure-sig-ubuntu-2204: ## Builds Ubuntu 22.04 Azure managed image in Shared Image Gallery build-azure-sig-centos-7: ## Builds CentOS 7 Azure managed image in Shared Image Gallery build-azure-sig-windows-2019: ## Builds Windows Server 2019 Azure managed image in Shared Image Gallery build-azure-sig-windows-2019-containerd: ## Builds Windows Server 2019 with containerd Azure managed image in Shared Image Gallery @@ -502,6 +503,7 @@ build-azure-sig-windows-2022-containerd: ## Builds Windows Server 2022 with cont build-azure-sig-windows-2004: ## Builds Windows Server 2004 SAC Azure managed image in Shared Image Gallery build-azure-vhd-ubuntu-1804: ## Builds Ubuntu 18.04 VHD image for Azure build-azure-vhd-ubuntu-2004: ## Builds Ubuntu 20.04 VHD image for Azure +build-azure-vhd-ubuntu-2204: ## Builds Ubuntu 22.04 VHD image for Azure build-azure-vhd-centos-7: ## Builds CentOS 7 VHD image for Azure build-azure-vhd-windows-2019: ## Builds for Windows Server 2019 build-azure-vhd-windows-2019-containerd: ## Builds for Windows Server 2019 with containerd @@ -512,6 +514,7 @@ build-azure-sig-flatcar: ## Builds Flatcar Azure managed image in Shared Image G build-azure-sig-flatcar-gen2: ## Builds Flatcar Azure Gen2 managed image in Shared Image Gallery build-azure-sig-ubuntu-1804-gen2: ## Builds Ubuntu 18.04 Gen2 managed image in Shared Image Gallery build-azure-sig-ubuntu-2004-gen2: ## Builds Ubuntu 20.04 Gen2 managed image in Shared Image Gallery +build-azure-sig-ubuntu-2204-gen2: ## Builds Ubuntu 22.04 Gen2 managed image in Shared Image Gallery build-azure-vhds: $(AZURE_BUILD_VHD_TARGETS) ## Builds all Azure VHDs build-azure-sigs: $(AZURE_BUILD_SIG_TARGETS) $(AZURE_BUILD_SIG_GEN2_TARGETS) ## Builds all Azure Shared Image Gallery images @@ -624,6 +627,7 @@ validate-ami-all: $(AMI_VALIDATE_TARGETS) ## Validates all AMIs Packer config validate-azure-sig-centos-7: ## Validates CentOS 7 Azure managed image in Shared Image Gallery Packer config validate-azure-sig-ubuntu-1804: ## Validates Ubuntu 18.04 Azure managed image in Shared Image Gallery Packer config validate-azure-sig-ubuntu-2004: ## Validates Ubuntu 20.04 Azure managed image in Shared Image Gallery Packer config +validate-azure-sig-ubuntu-2204: ## Validates Ubuntu 22.04 Azure managed image in Shared Image Gallery Packer config validate-azure-sig-windows-2019: ## Validate Windows Server 2019 Azure managed image in Shared Image Gallery Packer config validate-azure-sig-windows-2019-containerd: ## Validate Windows Server 2019 with containerd Azure managed image in Shared Image Gallery Packer config validate-azure-sig-windows-2022-containerd: ## Validate Windows Server 2022 with containerd Azure managed image in Shared Image Gallery Packer config @@ -631,6 +635,7 @@ validate-azure-sig-windows-2004: ## Validate Windows Server 2004 SAC Azure manag validate-azure-vhd-centos-7: ## Validates CentOS 7 VHD image Azure Packer config validate-azure-vhd-ubuntu-1804: ## Validates Ubuntu 18.04 VHD image Azure Packer config validate-azure-vhd-ubuntu-2004: ## Validates Ubuntu 20.04 VHD image Azure Packer config +validate-azure-vhd-ubuntu-2204: ## Validates Ubuntu 22.04 VHD image Azure Packer config validate-azure-vhd-windows-2019: ## Validate Windows Server 2019 VHD image Azure Packer config validate-azure-vhd-windows-2019-containerd: ## Validate Windows Server 2019 VHD with containerd image Azure Packer config validate-azure-vhd-windows-2022-containerd: ## Validate Windows Server 2022 VHD with containerd image Azure Packer config @@ -638,6 +643,7 @@ validate-azure-vhd-windows-2004: ## Validate Windows Server 2004 SAC VHD image A validate-azure-sig-centos-7-gen2: ## Validates CentOS 7 Azure managed image in Shared Image Gallery Packer config validate-azure-sig-ubuntu-1804-gen2: ## Validates Ubuntu 18.04 Azure managed image in Shared Image Gallery Packer config validate-azure-sig-ubuntu-2004-gen2: ## Validates Ubuntu 20.04 Azure managed image in Shared Image Gallery Packer config +validate-azure-sig-ubuntu-2204-gen2: ## Validates Ubuntu 22.04 Azure managed image in Shared Image Gallery Packer config validate-azure-all: $(AZURE_VALIDATE_SIG_TARGETS) $(AZURE_VALIDATE_VHD_TARGETS) $(AZURE_VALIDATE_SIG_GEN2_TARGETS) ## Validates all images for Azure Packer config validate-do-ubuntu-1804: ## Validates Ubuntu 18.04 DigitalOcean Snapshot Packer config diff --git a/images/capi/azure_targets.sh b/images/capi/azure_targets.sh index f842552f7a..9b781e7dbe 100644 --- a/images/capi/azure_targets.sh +++ b/images/capi/azure_targets.sh @@ -1,3 +1,3 @@ -VHD_TARGETS="ubuntu-1804 ubuntu-2004 centos-7 windows-2019 windows-2019-containerd windows-2022-containerd" -SIG_TARGETS="ubuntu-1804 ubuntu-2004 centos-7 windows-2019 windows-2019-containerd windows-2022-containerd flatcar" -SIG_GEN2_TARGETS="ubuntu-1804 ubuntu-2004 centos-7 flatcar" +VHD_TARGETS="ubuntu-1804 ubuntu-2004 ubuntu-2204 centos-7 windows-2019 windows-2019-containerd windows-2022-containerd" +SIG_TARGETS="ubuntu-1804 ubuntu-2004 ubuntu-2204 centos-7 windows-2019 windows-2019-containerd windows-2022-containerd flatcar" +SIG_GEN2_TARGETS="ubuntu-1804 ubuntu-2004 ubuntu-2204 centos-7 flatcar" diff --git a/images/capi/packer/azure/scripts/init-sig.sh b/images/capi/packer/azure/scripts/init-sig.sh index 51e352d296..b0879829a6 100755 --- a/images/capi/packer/azure/scripts/init-sig.sh +++ b/images/capi/packer/azure/scripts/init-sig.sh @@ -39,6 +39,9 @@ case ${SIG_TARGET} in ubuntu-2004) create_image_definition ${SIG_TARGET} "20_04-lts" "V1" "Linux" ;; + ubuntu-2204) + create_image_definition ${SIG_TARGET} "22_04-lts" "V1" "Linux" + ;; centos-7) create_image_definition "centos-7.7" "centos-7.7" "V1" "Linux" ;; @@ -61,6 +64,9 @@ case ${SIG_TARGET} in ubuntu-2004-gen2) create_image_definition ${SIG_TARGET} "20_04-lts-gen2" "V2" "Linux" ;; + ubuntu-2204-gen2) + create_image_definition ${SIG_TARGET} "22_04-lts-gen2" "V2" "Linux" + ;; centos-7-gen2) create_image_definition "centos-7.7-gen2" "centos-7.7-gen2" "V2" "Linux" ;; diff --git a/images/capi/packer/azure/ubuntu-2204-gen2.json b/images/capi/packer/azure/ubuntu-2204-gen2.json new file mode 100644 index 0000000000..78442cb23d --- /dev/null +++ b/images/capi/packer/azure/ubuntu-2204-gen2.json @@ -0,0 +1,9 @@ +{ + "build_name": "ubuntu-2204-gen2", + "distribution": "ubuntu", + "distribution_release": "jammy", + "distribution_version": "2204", + "image_offer": "0001-com-ubuntu-server-jammy", + "image_publisher": "Canonical", + "image_sku": "22_04-lts-gen2" +} diff --git a/images/capi/packer/azure/ubuntu-2204.json b/images/capi/packer/azure/ubuntu-2204.json new file mode 100644 index 0000000000..d32ba3e282 --- /dev/null +++ b/images/capi/packer/azure/ubuntu-2204.json @@ -0,0 +1,9 @@ +{ + "build_name": "ubuntu-2204", + "distribution": "ubuntu", + "distribution_release": "jammy", + "distribution_version": "2204", + "image_offer": "0001-com-ubuntu-server-jammy", + "image_publisher": "Canonical", + "image_sku": "22_04-lts" +}