Merge pull request #1599 from mboersma/fix-azurelinux-3

Update Azure Linux 3 base image source
kubernetes-sigs · Oct 16, 2024 · 607b1c0 · 607b1c0
2 parents 83c7e31 + 14925bb
commit 607b1c0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/images/capi/ansible/roles/setup/tasks/azurelinux.yml b/images/capi/ansible/roles/setup/tasks/azurelinux.yml
@@ -14,20 +14,20 @@
 ---
 - ansible.builtin.import_tasks: rpm_repos.yml
 
-- name: Perform a yum update
-  ansible.builtin.yum:
+- name: Perform a tdnf update
+  ansible.builtin.dnf:
     name: "*"
     state: latest
     lock_timeout: 60
 
 - name: Install baseline dependencies on Azure Linux
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ rpms }}"
     state: present
     lock_timeout: 60
 
 - name: Install extra rpms
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: "{{ extra_rpms.split() }}"
     state: present
     lock_timeout: 60
diff --git a/images/capi/azure_targets.sh b/images/capi/azure_targets.sh
@@ -1,8 +1,8 @@
 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-2022-containerd"
+VHD_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 windows-2022-containerd"
 SIG_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd windows-2025-containerd flatcar"
-SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 mariner-2 windows-2022-containerd flatcar"
+SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 windows-2022-containerd 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_GEN2_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 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"
diff --git a/images/capi/packer/azure/azurelinux-3-gen2.json b/images/capi/packer/azure/azurelinux-3-gen2.json
@@ -3,7 +3,7 @@
   "distribution": "azurelinux",
   "distribution_release": "azure-linux-gen2",
   "distribution_version": "3",
-  "image_offer": "azure-linux",
+  "image_offer": "azure-linux-3",
   "image_publisher": "MicrosoftCBLMariner",
-  "image_sku": "azure-linux-gen2"
+  "image_sku": "azure-linux-3-gen2"
 }
diff --git a/images/capi/packer/azure/azurelinux-3.json b/images/capi/packer/azure/azurelinux-3.json
@@ -3,7 +3,7 @@
   "distribution": "azurelinux",
   "distribution_release": "azure-linux-3",
   "distribution_version": "3",
-  "image_offer": "azure-linux",
+  "image_offer": "azure-linux-3",
   "image_publisher": "MicrosoftCBLMariner",
   "image_sku": "azure-linux-3"
 }