Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Azure Linux 3 for Azure #1465

Merged
merged 2 commits into from
May 16, 2024
Merged

Add Azure Linux 3 for Azure #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b706ce4
Change Mariner to Azure Linux
mboersma May 14, 2024
2814085
Add Azure Linux 3 for Azure
mboersma May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/book/src/capi/goss/goss.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ to test if the images have all requisite components to work with cluster API.
| OS | Builder |
|-------------------------|----------------------|
| Amazon Linux | aws |
| Azure Linux | azure |
| CentOS | aws, ova |
| Flatcar Container Linux | aws, azure, ova |
| Mariner | azure |
| PhotonOS | ova |
| Ubuntu | aws, azure, gcp, ova |
| Windows | aws, azure, ova |
Expand Down
13 changes: 4 additions & 9 deletions images/capi/.ansible-lint-ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ ansible/roles/kubernetes/tasks/ecrpull.yml no-changed-when
ansible/roles/kubernetes/tasks/kubeadmpull.yml command-instead-of-shell
ansible/roles/kubernetes/tasks/kubeadmpull.yml no-changed-when
ansible/roles/kubernetes/tasks/main.yml name[missing]
ansible/roles/kubernetes/tasks/mariner.yml jinja[spacing]
ansible/roles/kubernetes/tasks/mariner.yml no-changed-when
ansible/roles/kubernetes/tasks/photon.yml jinja[spacing]
ansible/roles/kubernetes/tasks/photon.yml no-changed-when
ansible/roles/kubernetes/tasks/redhat.yml jinja[spacing]
Expand All @@ -46,7 +44,6 @@ ansible/roles/providers/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/providers/tasks/aws.yml command-instead-of-shell
ansible/roles/providers/tasks/aws.yml name[missing]
ansible/roles/providers/tasks/aws.yml no-changed-when
ansible/roles/providers/tasks/aws.yml package-latest
ansible/roles/providers/tasks/awscliv2.yml no-changed-when
ansible/roles/providers/tasks/awscliv2.yml risky-file-permissions
ansible/roles/providers/tasks/azure.yml name[missing]
Expand All @@ -63,8 +60,6 @@ ansible/roles/providers/tasks/nutanix.yml name[missing]
ansible/roles/providers/tasks/nutanix.yml risky-file-permissions
ansible/roles/providers/tasks/raw.yml command-instead-of-shell
ansible/roles/providers/tasks/raw.yml no-changed-when
ansible/roles/providers/tasks/redhat.yml command-instead-of-module
ansible/roles/providers/tasks/redhat.yml no-changed-when
ansible/roles/providers/tasks/vmware-photon.yml no-changed-when
ansible/roles/providers/tasks/vmware-photon.yml risky-file-permissions
ansible/roles/providers/tasks/vmware-redhat.yml command-instead-of-shell
Expand All @@ -75,15 +70,16 @@ ansible/roles/python/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/python/tasks/flatcar.yml no-changed-when
ansible/roles/python/tasks/main.yml name[missing]
ansible/roles/python/tasks/main.yml no-changed-when
ansible/roles/security/tasks/trivy.yml jinja[spacing]
ansible/roles/setup/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/setup/tasks/azurelinux.yml name[missing]
ansible/roles/setup/tasks/azurelinux.yml package-latest
ansible/roles/setup/tasks/debian.yml command-instead-of-module
ansible/roles/setup/tasks/debian.yml no-changed-when
ansible/roles/setup/tasks/debian.yml package-latest
ansible/roles/setup/tasks/flatcar.yml name[missing]
ansible/roles/setup/tasks/flatcar.yml risky-file-permissions
ansible/roles/setup/tasks/main.yml name[missing]
ansible/roles/setup/tasks/mariner.yml name[missing]
ansible/roles/setup/tasks/mariner.yml package-latest
ansible/roles/setup/tasks/photon.yml name[missing]
ansible/roles/setup/tasks/photon.yml no-changed-when
ansible/roles/setup/tasks/redhat.yml command-instead-of-module
Expand All @@ -92,13 +88,12 @@ ansible/roles/setup/tasks/redhat.yml no-changed-when
ansible/roles/setup/tasks/redhat.yml package-latest
ansible/roles/setup/tasks/rpm_repos.yml no-changed-when
ansible/roles/sysprep/defaults/main.yml var-naming[no-role-prefix]
ansible/roles/sysprep/tasks/azurelinux.yml name[missing]
ansible/roles/sysprep/tasks/debian.yml no-changed-when
ansible/roles/sysprep/tasks/flatcar.yml no-changed-when
ansible/roles/sysprep/tasks/main.yml name[missing]
ansible/roles/sysprep/tasks/main.yml no-changed-when
ansible/roles/sysprep/tasks/main.yml risky-file-permissions
ansible/roles/sysprep/tasks/mariner.yml name[missing]
ansible/roles/sysprep/tasks/mariner.yml no-changed-when
ansible/roles/sysprep/tasks/photon.yml name[missing]
ansible/roles/sysprep/tasks/photon.yml no-changed-when
ansible/roles/sysprep/tasks/redhat.yml command-instead-of-module
Expand Down
32 changes: 26 additions & 6 deletions images/capi/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,8 @@ build-azure-sig-ubuntu-2004: ## Builds Ubuntu 20.04 Azure managed image in Share
build-azure-sig-ubuntu-2204: ## Builds Ubuntu 22.04 Azure managed image in Shared Image Gallery
build-azure-sig-ubuntu-2404: ## Builds Ubuntu 24.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-mariner-2: ## Builds Mariner 2 Azure managed image in Shared Image Gallery
build-azure-sig-mariner-2: ## Builds Azure Linux 2 Azure managed image in Shared Image Gallery
build-azure-sig-azurelinux-3: ## Builds Azure Linux 3 Azure managed image in Shared Image Gallery
build-azure-sig-rhel-8: ## Builds RHEL 8 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
build-azure-sig-windows-2022-containerd: ## Builds Windows Server 2022 with containerd Azure managed image in Shared Image Gallery
Expand All @@ -639,13 +640,15 @@ 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-ubuntu-2404: ## Builds Ubuntu 24.04 VHD image for Azure
build-azure-vhd-centos-7: ## Builds CentOS 7 VHD image for Azure
build-azure-vhd-mariner-2: ## Builds Mariner 2 VHD image for Azure
build-azure-vhd-mariner-2: ## Builds Azure Linux 2 VHD image for Azure
build-azure-vhd-azurelinux-3: ## Builds Azure Linux 3 VHD image for Azure
build-azure-vhd-rhel-8: ## Builds RHEL 8 VHD image for Azure
build-azure-vhd-windows-2019-containerd: ## Builds for Windows Server 2019 with containerd
build-azure-vhd-windows-2022-containerd: ## Builds for Windows Server 2022 with containerd
build-azure-sig-windows-annual-containerd: ## Builds for Windows Server Annual Channel with containerd
build-azure-sig-centos-7-gen2: ## Builds CentOS Gen2 managed image in Shared Image Gallery
build-azure-sig-mariner-2-gen2: ## Builds Mariner Gen2 managed image in Shared Image Gallery
build-azure-sig-mariner-2-gen2: ## Builds Azure Linux 2 Gen2 managed image in Shared Image Gallery
build-azure-sig-azurelinux-3-gen2: ## Builds Azure Linux 3 Gen2 managed image in Shared Image Gallery
build-azure-sig-flatcar: ## Builds Flatcar Azure managed image in Shared Image Gallery
build-azure-sig-flatcar-gen2: ## Builds Flatcar Azure Gen2 managed image in Shared Image Gallery
build-azure-sig-ubuntu-2004-gen2: ## Builds Ubuntu 20.04 Gen2 managed image in Shared Image Gallery
Expand All @@ -656,6 +659,13 @@ build-azure-sig-ubuntu-2204-cvm: ## Builds Ubuntu 22.04 CVM managed image in Sha
build-azure-sig-ubuntu-2404-cvm: ## Builds Ubuntu 24.04 CVM 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) $(AZURE_BUILD_SIG_CVM_TARGETS) ## Builds all Azure Shared Image Gallery images
# Targets for forward compatibility
build-azure-vhd-azurelinux-2: ## Alias for build-azure-vhd-mariner-2
$(MAKE) build-azure-vhd-mariner-2
build-azure-sig-azurelinux-2: ## Alias for build-azure-sig-mariner-2
$(MAKE) build-azure-sig-mariner-2
build-azure-sig-azurelinux-2-gen2: ## Alias for build-azure-sig-mariner-2-gen2
$(MAKE) validate-azure-sig-mariner-2-gen2

build-do-ubuntu-2004: ## Builds Ubuntu 20.04 DigitalOcean Snapshot
build-do-ubuntu-2204: ## Builds Ubuntu 22.04 DigitalOcean Snapshot
Expand Down Expand Up @@ -822,7 +832,8 @@ validate-ami-windows-2019: ## Validates Windows Server 2019 AMI Packer config
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-mariner-2: ## Validates Mariner 2 Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-mariner-2: ## Validates Azure Linux 2 Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-azurelinux-3: ## Validates Azure Linux 3 Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-rhel-8: ## Validates RHEL 8 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
Expand All @@ -831,22 +842,31 @@ validate-azure-sig-windows-2019-containerd: ## Validate Windows Server 2019 with
validate-azure-sig-windows-2022-containerd: ## Validate Windows Server 2022 with containerd Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-windows-annual-containerd: ## Validate Windows Server Annual Channel with containerd Azure managed image in Shared Image Gallery Packer config
validate-azure-vhd-centos-7: ## Validates CentOS 7 VHD image Azure Packer config
validate-azure-vhd-mariner-2: ## Validates Mariner 2 VHD image Azure Packer config
validate-azure-vhd-mariner-2: ## Validates Azure Linux 2 VHD image Azure Packer config
validate-azure-vhd-azurelinux-3: ## Validates Azure Linux 3 VHD image Azure Packer config
validate-azure-vhd-rhel-8: ## Validates RHEL 8 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-ubuntu-2404: ## Validates Ubuntu 24.04 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
validate-azure-sig-centos-7-gen2: ## Validates CentOS 7 Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-mariner-2-gen2: ## Validates Mariner 2 Gen2 Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-mariner-2-gen2: ## Validates Azure Linux 2 Gen2 Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-azurelinux-3-gen2: ## Validates Azure Linux 3 Gen2 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-2004-cvm: ## Validates Ubuntu 20.04 CVM 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-sig-ubuntu-2204-cvm: ## Validates Ubuntu 22.04 CVM Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-ubuntu-2404-gen2: ## Validates Ubuntu 24.04 Azure managed image in Shared Image Gallery Packer config
validate-azure-sig-ubuntu-2404-cvm: ## Validates Ubuntu 24.04 CVM 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) $(AZURE_VALIDATE_SIG_CVM_TARGETS) ## Validates all images for Azure Packer config
# Targets for forward compatibility
validate-azure-vhd-azurelinux-2: ## Alias for validate-azure-vhd-mariner-2
$(MAKE) validate-azure-vhd-mariner-2
validate-azure-sig-azurelinux-2: ## Alias for validate-azure-sig-mariner-2
$(MAKE) validate-azure-sig-mariner-2
validate-azure-sig-azurelinux-2-gen2: ## Alias for validate-azure-sig-mariner-2-gen2
$(MAKE) validate-azure-sig-mariner-2-gen2

validate-do-ubuntu-2004: ## Validates Ubuntu 20.04 DigitalOcean Snapshot Packer config
validate-do-ubuntu-2204: ## Validates Ubuntu 22.04 DigitalOcean Snapshot Packer config
Expand Down
4 changes: 2 additions & 2 deletions images/capi/ansible/roles/containerd/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
when: ansible_os_family == "Debian"

- ansible.builtin.import_tasks: redhat.yml
when: ansible_os_family in ["Common Base Linux Mariner", "RedHat"]
when: ansible_os_family in ["Common Base Linux Mariner", "Microsoft Azure Linux", "RedHat"]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, v3 has a completely different ansible_os_family string, as well as ansible_distribution. So we need to check for both.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, I'm working on a PR for ansible/ansible that adds Azure Linux detection in general, and sets the distro fact to Azure. This would simplify these checks. (Thanks for the Flatcar team for having blazed this trail already!)


- ansible.builtin.import_tasks: photon.yml
when: ansible_os_family == "VMware Photon OS"
Expand Down Expand Up @@ -137,7 +137,7 @@
dest: /etc/systemd/system/containerd.service.d/limit-nofile.conf
src: etc/systemd/system/containerd.service.d/limit-nofile.conf
mode: "0644"
when: ansible_os_family == "Common Base Linux Mariner"
when: ansible_os_family in ["Common Base Linux Mariner", "Microsoft Azure Linux"]

- name: Create containerd http proxy conf file if needed
ansible.builtin.template:
Expand Down
2 changes: 1 addition & 1 deletion ...ible/roles/containerd/templates/etc/systemd/system/containerd.service.d/limit-nofile.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Service]
# LimitNOFILE=infinity on Mariner means 1073741816, which has caused issues
# LimitNOFILE=infinity on Azure Linux means 1073741816, which has caused issues
# running some software in containers such as mysql5 and sshd.
LimitNOFILE=1048576
4 changes: 3 additions & 1 deletion ...nsible/roles/kubernetes/tasks/mariner.yml → ...ble/roles/kubernetes/tasks/azurelinux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
- kubelet-{{ kubernetes_rpm_version }}
- kubeadm-{{ kubernetes_rpm_version }}
- kubectl-{{ kubernetes_rpm_version }}
- kubernetes-cni{{ '-'+kubernetes_cni_rpm_version if kubernetes_cni_rpm_version else '' }}
- kubernetes-cni{{ '-' + kubernetes_cni_rpm_version if kubernetes_cni_rpm_version else '' }}

- name: Allow Kubernetes API server through iptables
ansible.builtin.iptables:
Expand All @@ -44,3 +44,5 @@

- name: Persist iptables configuration
ansible.builtin.shell: iptables-save -t filter > /etc/systemd/scripts/ip4save
register: iptables_output
changed_when: iptables_output.rc != 0
4 changes: 2 additions & 2 deletions images/capi/ansible/roles/kubernetes/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
- ansible.builtin.import_tasks: debian.yml
when: kubernetes_source_type == "pkg" and ansible_os_family == "Debian"

- ansible.builtin.import_tasks: mariner.yml
when: kubernetes_source_type == "pkg" and ansible_os_family == "Common Base Linux Mariner"
- ansible.builtin.import_tasks: azurelinux.yml
when: kubernetes_source_type == "pkg" and ansible_os_family in ["Common Base Linux Mariner", "Microsoft Azure Linux"]

- ansible.builtin.import_tasks: redhat.yml
when: kubernetes_source_type == "pkg" and ansible_os_family == "RedHat"
Expand Down
6 changes: 3 additions & 3 deletions images/capi/ansible/roles/node/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ al2_rpms:
- python-netifaces
- python-requests

# Used for Mariner distributions
mariner_rpms:
# Used for Azure Linux distributions
azurelinux_rpms:
- lsof

# Used for RedHat based distributions == 7 (ex. RHEL-7, CentOS-7 etc.)
Expand Down Expand Up @@ -115,7 +115,7 @@ common_raw_photon_rpms: []
# photon and flatcar do not have backward compatibility for legacy distro behavior for sysctl.conf by default
# as it uses systemd-sysctl. set this var so we can use for sysctl conf file value.
sysctl_conf_file: >-
{{ '/etc/sysctl.d/99-sysctl.conf' if ansible_os_family in ['Common Base Linux Mariner', 'Flatcar', 'VMware Photon OS']
{{ '/etc/sysctl.d/99-sysctl.conf' if ansible_os_family in ['Common Base Linux Mariner', 'Flatcar', 'Microsoft Azure Linux', 'VMware Photon OS']
else '/etc/sysctl.conf' }}

pause_image: registry.k8s.io/pause:3.9
Expand Down
4 changes: 2 additions & 2 deletions images/capi/ansible/roles/node/meta/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ dependencies:

- role: setup
vars:
rpms: "{{ common_rpms + mariner_rpms + lookup('vars', 'common_' + build_target + '_rpms') }}"
when: ansible_distribution == "Common Base Linux Mariner"
rpms: "{{ common_rpms + azurelinux_rpms + lookup('vars', 'common_' + build_target + '_rpms') }}"
when: ansible_distribution in ["Common Base Linux Mariner", "Microsoft Azure Linux"]
2 changes: 1 addition & 1 deletion images/capi/ansible/roles/node/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
name: conntrackd
state: stopped
enabled: false
when: ansible_os_family not in ["Common Base Linux Mariner", "Debian", "Flatcar"]
when: ansible_os_family not in ["Common Base Linux Mariner", "Debian", "Flatcar", "Microsoft Azure Linux"]

- name: Ensure auditd is running and comes on at reboot
ansible.builtin.service:
Expand Down
2 changes: 1 addition & 1 deletion images/capi/ansible/roles/providers/tasks/azurecli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
state: present

- name: Install Azure CLI
when: ansible_os_family == "Common Base Linux Mariner"
when: ansible_os_family in ["Common Base Linux Mariner", "Microsoft Azure Linux"]
ansible.builtin.package:
name: azure-cli
state: present
Expand Down
2 changes: 1 addition & 1 deletion ...api/ansible/roles/setup/tasks/mariner.yml → .../ansible/roles/setup/tasks/azurelinux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
state: latest
lock_timeout: 60

- name: Install baseline dependencies on Mariner
- name: Install baseline dependencies on Azure Linux
ansible.builtin.yum:
name: "{{ rpms }}"
state: present
Expand Down
4 changes: 2 additions & 2 deletions images/capi/ansible/roles/setup/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# "Flatcar" for comparison, which is the correct value.
when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

- ansible.builtin.import_tasks: mariner.yml
when: ansible_os_family == "Common Base Linux Mariner"
- ansible.builtin.import_tasks: azurelinux.yml
when: ansible_os_family in ["Common Base Linux Mariner", "Microsoft Azure Linux"]

- ansible.builtin.import_tasks: redhat.yml
when: ansible_os_family == "RedHat"
Expand Down
2 changes: 2 additions & 0 deletions ...i/ansible/roles/sysprep/tasks/mariner.yml → ...nsible/roles/sysprep/tasks/azurelinux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

- name: Ensure nftables config ends with a newline
ansible.builtin.shell: /bin/echo "" >> /etc/sysconfig/nftables.conf
register: echo_output
changed_when: echo_output.rc != 0

- name: Disable swap service and ensure it is masked
ansible.builtin.systemd:
Expand Down
8 changes: 4 additions & 4 deletions images/capi/ansible/roles/sysprep/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
- ansible.builtin.import_tasks: redhat.yml
when: ansible_os_family == "RedHat"

- ansible.builtin.import_tasks: mariner.yml
when: ansible_os_family == "Common Base Linux Mariner"
- ansible.builtin.import_tasks: azurelinux.yml
when: ansible_os_family in ["Common Base Linux Mariner", "Microsoft Azure Linux"]

- ansible.builtin.import_tasks: photon.yml
when: ansible_os_family == "VMware Photon OS"
Expand All @@ -49,7 +49,7 @@
loop:
- { path: /etc/machine-id, state: absent, mode: "{{ machine_id_mode }}" }
- { path: /etc/machine-id, state: touch, mode: "{{ machine_id_mode }}" }
when: ansible_os_family not in ["Common Base Linux Mariner", "Flatcar"]
when: ansible_os_family not in ["Common Base Linux Mariner", "Flatcar", "Microsoft Azure Linuz"]

- name: Truncate hostname file
ansible.builtin.file:
Expand All @@ -65,7 +65,7 @@
- name: Set hostname
ansible.builtin.hostname:
name: localhost.local
when: ansible_os_family not in ["Common Base Linux Mariner", "Flatcar", "VMware Photon OS"] and packer_build_name != "nutanix"
when: ansible_os_family not in ["Common Base Linux Mariner", "Flatcar", "Microsoft Azure Linux", "VMware Photon OS"] and packer_build_name != "nutanix"

- name: Reset hosts file
ansible.builtin.copy:
Expand Down
6 changes: 3 additions & 3 deletions images/capi/azure_targets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VHD_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 rhel-8 windows-2019-containerd windows-2022-containerd"
VHD_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd"
VHD_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2019-containerd windows-2022-containerd"
SIG_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 rhel-8 windows-2019-containerd windows-2022-containerd flatcar"
SIG_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd flatcar"
SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2019-containerd windows-2022-containerd flatcar"
SIG_GEN2_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 flatcar"
SIG_GEN2_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 flatcar"
SIG_GEN2_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 flatcar"
SIG_CVM_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 windows-2019-containerd windows-2022-containerd"
SIG_CVM_CI_TARGETS="ubuntu-2204 ubuntu-2404 windows-2022-containerd"
9 changes: 9 additions & 0 deletions images/capi/packer/azure/azurelinux-3-gen2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"build_name": "azurelinux-3-gen2",
"distribution": "azurelinux",
"distribution_release": "azure-linux-gen2",
"distribution_version": "3",
"image_offer": "azure-linux",
"image_publisher": "MicrosoftCBLMariner",
"image_sku": "azure-linux-gen2"
}
9 changes: 9 additions & 0 deletions images/capi/packer/azure/azurelinux-3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"build_name": "azurelinux-3",
"distribution": "azurelinux",
"distribution_release": "azure-linux-3",
"distribution_version": "3",
"image_offer": "azure-linux",
"image_publisher": "MicrosoftCBLMariner",
"image_sku": "azure-linux-3"
}
Loading