ARM64 support for MaaS

Author: kreeuwijk

images/capi/Makefile

@@ -405,7 +405,8 @@ PROXMOX_BUILD_NAMES 		?= proxmox-ubuntu-2204 proxmox-ubuntu-2404 proxmox-ubuntu-
 
 VULTR_BUILD_NAMES 				?=	vultr-ubuntu-2204 vultr-ubuntu-2404
 
-MAAS_BUILD_NAMES 			?= maas-ubuntu-2204-efi maas-ubuntu-2404-efi
+MAAS_BUILD_NAMES         ?= maas-ubuntu-2204-efi maas-ubuntu-2404-efi
+MAAS_ARM64_BUILD_NAMES   ?= maas-ubuntu-2204-arm64 maas-ubuntu-2404-arm64
 
 SCALEWAY_BUILD_NAMES 				?=	scaleway-rockylinux-9 scaleway-ubuntu-2204 scaleway-ubuntu-2404
 
@@ -459,6 +460,8 @@ VULTR_BUILD_TARGETS 	:= $(addprefix build-,$(VULTR_BUILD_NAMES))
 VULTR_VALIDATE_TARGETS 	:= $(addprefix validate-,$(VULTR_BUILD_NAMES))
 MAAS_BUILD_TARGETS 	:= $(addprefix build-,$(MAAS_BUILD_NAMES))
 MAAS_VALIDATE_TARGETS 	:= $(addprefix validate-,$(MAAS_BUILD_NAMES))
+MAAS_ARM64_BUILD_TARGETS 	:= $(addprefix build-,$(MAAS_ARM64_BUILD_NAMES))
+MAAS_ARM64_VALIDATE_TARGETS 	:= $(addprefix validate-,$(MAAS_ARM64_BUILD_NAMES))
 SCALEWAY_BUILD_TARGETS		:= $(addprefix build-,$(SCALEWAY_BUILD_NAMES))
 SCALEWAY_VALIDATE_TARGETS	:= $(addprefix validate-,$(SCALEWAY_BUILD_NAMES))
 
@@ -664,6 +667,14 @@ $(MAAS_BUILD_TARGETS): deps-qemu set-ssh-password
 $(MAAS_VALIDATE_TARGETS): deps-qemu set-ssh-password
 	$(PACKER) validate $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/maas/$(subst validate-,,$@).json)" --var="ansible_user_vars=provider=maas" $(ABSOLUTE_PACKER_VAR_FILES) packer/maas/packer.json
 
+.PHONY: $(MAAS_ARM64_BUILD_TARGETS)
+$(MAAS_ARM64_BUILD_TARGETS): deps-qemu set-ssh-password
+	$(PACKER) build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/maas/$(subst build-,,$@).json)" --var="ansible_user_vars=provider=maas" $(ABSOLUTE_PACKER_VAR_FILES) packer/maas/packer-arm64.json
+
+.PHONY: $(MAAS_ARM64_VALIDATE_TARGETS)
+$(MAAS_ARM64_VALIDATE_TARGETS): deps-qemu set-ssh-password
+	$(PACKER) validate $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/maas/$(subst validate-,,$@).json)" --var="ansible_user_vars=provider=maas" $(ABSOLUTE_PACKER_VAR_FILES) packer/maas/packer-arm64.json
+
 .PHONY: $(SCALEWAY_BUILD_TARGETS)
 $(SCALEWAY_BUILD_TARGETS): deps-scaleway
 	$(PACKER) build $(PACKER_NODE_FLAGS) -var-file="$(abspath packer/scaleway/$(subst build-scaleway-,,$@).json)" $(ABSOLUTE_PACKER_VAR_FILES) packer/scaleway/packer.json
@@ -831,6 +842,8 @@ build-qemu-all: $(QEMU_BUILD_TARGETS) ## Builds all Qemu images
 
 build-maas-ubuntu-2204-efi: ## Builds Ubuntu 22.04 MaaS image that EFI boots
 build-maas-ubuntu-2404-efi: ## Builds Ubuntu 24.04 MaaS image that EFI boots
+build-maas-ubuntu-2204-arm64: ## Builds Ubuntu 22.04 ARM64 MaaS image that EFI boots
+build-maas-ubuntu-2404-arm64: ## Builds Ubuntu 24.04 ARM64 MaaS image that EFI boots
 
 build-raw-flatcar: ## Builds Flatcar RAW image
 build-raw-ubuntu-2204: ## Builds Ubuntu 22.04 RAW image

images/capi/ansible/roles/firstboot/meta/main.yml

@@ -19,9 +19,20 @@ dependencies:
       debs: ""
     when: ansible_os_family == "VMware Photon OS"
 
+  - role: setup
+    vars:
+      rpms: >-
+        {{ ( common_rpms + rh8_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) }}
+      debs: "{{ common_debs +  lookup('vars', 'common_' + build_target + '_debs_arm64') }}"
+    when: >
+      packer_builder_type is search('qemu')
+        and ansible_architecture == "aarch64"
+
   - role: setup
     vars:
       rpms: >-
         {{ ( common_rpms + rh8_rpms + lookup('vars', 'common_' + build_target + '_rpms') ) }}
       debs: "{{ common_debs +  lookup('vars', 'common_' + build_target + '_debs') }}"
-    when: packer_builder_type is search('qemu')
+    when: >
+      packer_builder_type is search('qemu')
+        and ansible_architecture != "aarch64"

images/capi/ansible/roles/node/defaults/main.yml

@@ -102,6 +102,10 @@ photon_5_rpms:
 common_virt_rpms:
   - open-vm-tools
 
+common_virt_debs_arm64:
+  - linux-tools-virtual
+  - open-vm-tools
+
 common_virt_debs:
   - linux-cloud-tools-virtual
   - linux-tools-virtual

images/capi/ansible/roles/providers/tasks/qemu.yml

@@ -40,7 +40,7 @@
     name: hv-kvp-daemon
     state: stopped
     enabled: false
-  when: ansible_os_family == "Debian"
+  when: ansible_os_family == "Debian" and ansible_architecture != "aarch64"
 
 - name: Create directory for DHCP chrony server files
   ansible.builtin.file:

images/capi/ansible/roles/setup/templates/etc/apt/sources.list.d/ubuntu.sources.j2

@@ -1,11 +1,11 @@
 Types: deb
-URIs: http://us.archive.ubuntu.com/ubuntu/
+URIs: {{ ubuntu_repo }}/
 Suites: {{ ansible_distribution_release }} {{ ansible_distribution_release }}-updates {{ ansible_distribution_release }}-backports
 Components: main restricted universe multiverse
 Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
 
 Types: deb
-URIs: http://security.ubuntu.com/ubuntu/
+URIs: {{ ubuntu_security_repo }}/
 Suites: {{ ansible_distribution_release }}-security
 Components: main restricted universe multiverse
 Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg

images/capi/packer/goss/goss-vars.yaml

@@ -496,7 +496,7 @@ ubuntu:
         enabled: true
         running: true
     package:
-      linux-cloud-tools-virtual:
+      #linux-cloud-tools-virtual:
       linux-tools-virtual:
       open-vm-tools:
       cloud-guest-utils:

images/capi/packer/maas/README.md

@@ -1,16 +1,60 @@
+# Prereqs
+
+Assuming you're building on Ubuntu:
+```
+apt update
+apt install -y make jq unzip python3-pip
+cd images/capi
+make deps-qemu
+```
+
+If you will be building ARM64 images, ensure you run the builder on a native ARM64 server and add these additional prereqs:
+```
+apt-get install qemu-system-arm libvirt-daemon-system -y
+
+# create EFI disk images for ARM64
+pushd /var/lib/libvirt/images/
+dd if=/dev/zero of=capi.fd bs=1M count=64
+dd if=/dev/zero of=capi-nvmram.fd bs=1M count=64
+dd if=/usr/share/qemu-efi-aarch64/QEMU_EFI.fd of=capi.fd conv=notrunc
+popd
+```
+
+# Building
+
 To build an image using a specific version of Kubernetes use the "PACKER_FLAGS" env var like in the example below:
 
+For AMD64:
+```
+export PATH=/root/.local/bin:$PATH
+
 PACKER_FLAGS="--var 'kubernetes_rpm_version=1.30.5' --var 'kubernetes_semver=v1.30.5' --var 'kubernetes_series=v1.30' --var 'kubernetes_deb_version=1.30.5-1.1'" make build-maas-ubuntu-2204-efi
+```
+
+For ARM64:
+```
+export PATH=/root/.local/bin:$PATH
+
+ARCH=arm64 PACKER_FLAGS="--var 'kubernetes_rpm_version=1.30.5' --var 'kubernetes_semver=v1.30.5' --var 'kubernetes_series=v1.30' --var 'kubernetes_deb_version=1.30.5-1.1'" make build-maas-ubuntu-2204-arm64
+```
 
 P.S: In order to change disk size(defaults to 20GB as of 31.10.22) you can update PACKER_FLAGS with:
 --var 'disk_size=<disk size in mb>'
 
+# Uploading to MaaS
 
-Upload images to MaaS
+To upload the generates images to MaaS, run the following command.
 
+For AMD64:
+```
+maas <PROFILE> boot-resources create name=<IMAGE NAME> architecture=amd64/generic title=<IMAGE NAME> base_image=ubuntu/<SEE NOTES> content@=./<FILE>.tar.gz
 ```
-maas <PROFILE> boot-resources create name=custom/<IMAGE NAME> architecture=amd64/generic title=<IMAGE NAME> subarches=generic base_image=ubuntu/<SEE NOTES> content@=./<FILE>.tar.gz
+
+For ARM64:
 ```
+maas <PROFILE> boot-resources create name=<IMAGE NAME> architecture=arm64/generic title=<IMAGE NAME> base_image=ubuntu/<SEE NOTES> content@=./<FILE>.tar.gz
+```
+
 
 Notes / Things you need to known:
 

images/capi/packer/maas/linux/ubuntu/http/22.04.arm64/meta-data

@@ -0,0 +1,106 @@
+#cloud-config
+# Copyright 2022 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# For more information on how autoinstall is configured, please refer to
+# https://ubuntu.com/server/docs/install/autoinstall-reference
+autoinstall:
+  version: 1
+  # Disable ssh server during installation, otherwise packer tries to connect and exceed max attempts
+  early-commands:
+    - systemctl stop ssh
+  # Configure the locale
+  locale: en_US.UTF-8
+  keyboard:
+    layout: us
+  # For more information on how partitioning is configured,
+  # please refer to https://curtin.readthedocs.io/en/latest/topics/storage.html.
+  storage:
+    grub:
+      reorder_uefi: false
+      replace_linux_default: false
+    config:
+    - ptable: gpt
+      path: /dev/vda
+      wipe: superblock-recursive
+      preserve: false
+      name: ''
+      grub_device: false
+      type: disk
+      id: disk-vda
+    - device: disk-vda
+      # Create EFI partition of 512MB same as in Ubuntu 20.04
+      size: 536870912
+      wipe: superblock
+      flag: boot
+      number: 1
+      preserve: false
+      grub_device: true
+      type: partition
+      id: partition-0
+    - fstype: fat32
+      volume: partition-0
+      preserve: false
+      type: format
+      id: format-0
+    - device: disk-vda
+      size: -1
+      wipe: superblock
+      flag: ''
+      number: 2
+      preserve: false
+      grub_device: false
+      type: partition
+      id: partition-1
+    - fstype: ext4
+      volume: partition-1
+      preserve: false
+      type: format
+      id: format-1
+    - path: /
+      device: format-1
+      type: mount
+      id: mount-1
+    - path: /boot/efi
+      device: format-0
+      type: mount
+      id: mount-0
+  updates: "all"
+  ssh:
+    install-server: true
+    allow-pw: true
+  # Create the default user.
+  # Ensures the "builder" user doesn't require a password to use sudo.
+  user-data:
+    users:
+      - name: builder
+        # openssl passwd -6 -salt <random salt> -stdin <<< <SSH password>
+        passwd: $ENCRYPTED_SSH_PASSWORD
+        groups: [adm, cdrom, dip, plugdev, lxd, sudo]
+        lock-passwd: false
+        sudo: ALL=(ALL) NOPASSWD:ALL
+        shell: /bin/bash
+
+  # This command runs after all other steps; it:
+  # 1. Disables swapfiles
+  # 2. Removes the existing swapfile
+  # 3. Removes the swapfile entry from /etc/fstab
+  # 4. Cleans up any packages that are no longer required
+  # 5. Removes the cached list of packages
+  late-commands:
+    - swapoff -a
+    - rm -f /swapfile
+    - sed -ri '/\sswap\s/s/^#?/#/' /etc/fstab
+    - apt-get purge --auto-remove -y
+    - rm -rf /var/lib/apt/lists/*