From 7e2fe023a3726d625d4080b1dbb02ee5d3407551 Mon Sep 17 00:00:00 2001
From: Nan Liu <108544011+liunan-ms@users.noreply.github.com>
Date: Mon, 13 Jan 2025 16:03:43 -0800
Subject: [PATCH] feat: add containerd 2.0 to azureLinux 3.0 (#5510)

---
 parts/linux/cloud-init/artifacts/components.json            | 2 +-
 .../cloud-init/artifacts/mariner/cse_install_mariner.sh     | 5 ++++-
 pkg/agent/testdata/AzureLinuxV2+Kata/CustomData             | 2 +-
 pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh              | 5 ++++-
 .../AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData | 2 +-
 .../AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh  | 5 ++++-
 .../AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData  | 2 +-
 .../AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh   | 5 ++++-
 .../CustomData                                              | 2 +-
 .../line61.sh                                               | 5 ++++-
 .../CustomData                                              | 2 +-
 .../line61.sh                                               | 5 ++++-
 pkg/agent/testdata/MarinerV2+CustomCloud/CustomData         | 2 +-
 pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh          | 5 ++++-
 pkg/agent/testdata/MarinerV2+Kata/CustomData                | 2 +-
 pkg/agent/testdata/MarinerV2+Kata/line61.sh                 | 5 ++++-
 .../Marinerv2+DisableUnattendedUpgrades=false/CustomData    | 2 +-
 .../Marinerv2+DisableUnattendedUpgrades=false/line61.sh     | 5 ++++-
 .../Marinerv2+DisableUnattendedUpgrades=true/CustomData     | 2 +-
 .../Marinerv2+DisableUnattendedUpgrades=true/line61.sh      | 5 ++++-
 .../CustomData                                              | 2 +-
 .../line61.sh                                               | 5 ++++-
 .../CustomData                                              | 2 +-
 .../Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh | 5 ++++-
 spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh   | 6 +++---
 spec/parts/linux/cloud-init/artifacts/test_components.json  | 2 +-
 26 files changed, 64 insertions(+), 28 deletions(-)

diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json
index 0377f602a9c..52275770abe 100644
--- a/parts/linux/cloud-init/artifacts/components.json
+++ b/parts/linux/cloud-init/artifacts/components.json
@@ -675,7 +675,7 @@
             "versionsV2": [
               {
                 "renovateTag": "<DO_NOT_UPDATE>",
-                "latestVersion": "1.7.13-3.azl3"
+                "latestVersion": "2.0.0-1.azl3"
               }
             ]
           }
diff --git a/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh b/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
index 85a693d35f4..8692aecebd4 100755
--- a/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
+++ b/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
@@ -133,7 +133,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         # TODO: tie runc to r92 once that's possible on Mariner's pkg repo and if we're still using v1.linux shim
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
index 99bbec76280..12cbd2a2ab1 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/8RY62/bOBL/rr9iqhpos1tKcRbbA3brA3yx2hpNnEC2cx+CwKCpkc2aIlWScusm+d8PlGT5UefR3QP2S6yQ8/jNcF7kyxfhlMtwSs3c85DNFfhDVWjG5QyYwQmXxlIhJgk3VqvAzCFVGs6p5hK173kaM7XEUyUtdSvJ6yO49QAAWLN0SdmCznBAM+z4m2W/JOMpXF9D62I4uYriYf9iAJ0O+CfBsQ83N3+CnaMs6R4RmanpiuzLTXn5o9HqFcuSCU8nKeWi0AjtY/gd3h5DIlOo4ANZQeugdO/e82oX9DA3jXWJTCcZXSCjbI5wdwf4jVtoRXE86V6OJuPLXncUTUb98+hiPGo4ijyh9gB5rz90PB/ibm+XyfnaMeYVIuASGCUMteUpZ9SiATZHtiAajaXaAuOpIYXlwgATqkgIl9wS+r3QSBbL3LlQWk3ZglilHJH7FnzqtBBaWJVRyxng1NKpQANo544Q0sIgzLgFLpXl6apm58qqHHiuVWEReG7QAs9r3s9fYIFaoiAJLlGAUDOtrHOAMCoFmdGcSEYtyAZzTjPI+ew75CbjhoE2KyPUDIxydGZljKUWnAFYqXRsRHBZfINv3+E7z2Eq1NShPQGZ1kC4YYaXnuDUKl3p+hMSVUcWT+FF6eb6pOG3Y2jD2+NjaG05fy8Yd0+wPxiOumdnO4fXBGGiJHo/Ge0HTp7mOdWZ0iSn2qAGwafrpcbqLav+ol3Ps6yxrbauXtlkyydq6U7G/Gj6iw747QOmPwx7QS0lNWxD5srYv34oFdpEfZVC0eTD5bin+RL1BvDLrb+fongQna2Rd1qvC0kzBKLhDgwm8MqEJAzC2aujkvx03Os2xP4vk9btroD7X/wmHh4wlRUJJa3bbUn3O8Y+bWplIdNILQ6WPOF0uMoEl4uR6rpytuQMByrBjcmDq36v3530oqvJ6cdu3PFDwadhkeAy1IVAEyThv9pElrJcUhM2pzoot6qqa1XB5uC3bvck3VfbLonfvYPo4j38+zBV93TkfNbxaZL4b6AXXV12Rx87HT+cFibMGQ+T6pjCCoX/BuLx4NeOHxZGl52sRsfswtULixlUHmjwElN5wQAh9RYVwveii/fVofxdUVtZULn9PZ1qzs6ppDPUPzg77l9F8VZoscICSYAASeEE3r17B37rtc4zIF9oGRZH/lHTHCqI21WiBp2WOklWKSUbX++ou3+AvCzYDzI9r3TuQvub1XPfpc3AMVJKLLhtvHrejfuDKJ7UyE8vBqNuuTC6uDj71B9tOfrzF5fAr4K63ZvrmzKbBTL7Oijz2xXndRCsFZadb8GtfwR3EKzrxzjum6Bss2UzClihNUobuFDlSpqrk+vjm0C4jm2vqrVX0Dq9OL+8GESD0XDyvn8WuVA/2jQKIN/Bbz3XIB92q2g1yz2EHqSykKpCJuVMobJcSZTWBJ+Nkj68hOhbjsxiUkaZEglquPrYg6/czkHiVzgdRrWiZ3vcbwftt8FJM589EsSCT/eRt0nr9rmq7g8JqEaWn5LykPfIlBr8/0j6CSH/QNq5vEPppqgq7S5d6BqLkuG5SrDJuksHcTiKBqdRbzKM4qv+aVSG9KQs336IloVVDU3q33V1zTcik8Cgdl1pu5m0bh8Xfv9jZ3mSBbzrseT2xuuhYZrnlivZqfwPWyZCj2KmpPdfKq3pVKNoYKmeofW862GF9cYbrXLspEovuJx50TdkQzeKd/bbyLahQMgS9VQZrBlUfqmM7ZT0OgOiUwiXVIe6OMjvxdW836HiK10Zz7vuV4FwU4LF5D+rTlYIy0lhUK8xNx2uOgFmBVSHC4+cRXNbae+xrq8cz+PdFPChpTKhQslDt0ahGBWQoOEak7pQdvzWbfsPUs8QLzGYBW/2SOArF+6CoRYg+ALBzrmBdvA2OHlLfg9YdlKPZXEcDbZbwObOB6Qu1XAHdQf2wXc9+Ldmxrtb3t292tr/tdxvV914XbYNZkvUpyrLqUZwE9yO0j+IfxwcB8f+PbRud42430/WsoLXnUSsoPYfJlsXYVij/kHRPXADs3Io0WDnVMJrpQG/FFSAVUdQxQS4SrYlZA9RAGbB85zLGTxyekF1MigM7oGvmcrHhEOY99T5Dfv+s8JTbwCbZfKI1J95bHj+g8NjGtdt7omifVDRAUCb+t20id5TN7Q1hMp4kkJZjDca3WfKZ4FVmQh0nhm6xB/dkS2fxfcITQOm7Cmm0BgXktWZX4VL/awEbsOFL5dMFAmWM4qd4/rZqQpanrlhQentyKo9S11BD2C4jt31lOa+qWzI3L9OlV/ekwRSOc4PXARdPY5TaH24HE960XAEocptOMuL7QvkJlTfa5XVgdCIqMx7lLacyHiWC8xQrgevbP3O9qCmcXz2LC3j+OxJDS9dg/hfAAAA///VCYQxERQAAA==
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
index 99bbec76280..12cbd2a2ab1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    H4sIAAAAAAAC/8RY62/bOBL/rr9iqhpos1tKcRbbA3brA3yx2hpNnEC2cx+CwKCpkc2aIlWScusm+d8PlGT5UefR3QP2S6yQ8/jNcF7kyxfhlMtwSs3c85DNFfhDVWjG5QyYwQmXxlIhJgk3VqvAzCFVGs6p5hK173kaM7XEUyUtdSvJ6yO49QAAWLN0SdmCznBAM+z4m2W/JOMpXF9D62I4uYriYf9iAJ0O+CfBsQ83N3+CnaMs6R4RmanpiuzLTXn5o9HqFcuSCU8nKeWi0AjtY/gd3h5DIlOo4ANZQeugdO/e82oX9DA3jXWJTCcZXSCjbI5wdwf4jVtoRXE86V6OJuPLXncUTUb98+hiPGo4ijyh9gB5rz90PB/ibm+XyfnaMeYVIuASGCUMteUpZ9SiATZHtiAajaXaAuOpIYXlwgATqkgIl9wS+r3QSBbL3LlQWk3ZglilHJH7FnzqtBBaWJVRyxng1NKpQANo544Q0sIgzLgFLpXl6apm58qqHHiuVWEReG7QAs9r3s9fYIFaoiAJLlGAUDOtrHOAMCoFmdGcSEYtyAZzTjPI+ew75CbjhoE2KyPUDIxydGZljKUWnAFYqXRsRHBZfINv3+E7z2Eq1NShPQGZ1kC4YYaXnuDUKl3p+hMSVUcWT+FF6eb6pOG3Y2jD2+NjaG05fy8Yd0+wPxiOumdnO4fXBGGiJHo/Ge0HTp7mOdWZ0iSn2qAGwafrpcbqLav+ol3Ps6yxrbauXtlkyydq6U7G/Gj6iw747QOmPwx7QS0lNWxD5srYv34oFdpEfZVC0eTD5bin+RL1BvDLrb+fongQna2Rd1qvC0kzBKLhDgwm8MqEJAzC2aujkvx03Os2xP4vk9btroD7X/wmHh4wlRUJJa3bbUn3O8Y+bWplIdNILQ6WPOF0uMoEl4uR6rpytuQMByrBjcmDq36v3530oqvJ6cdu3PFDwadhkeAy1IVAEyThv9pElrJcUhM2pzoot6qqa1XB5uC3bvck3VfbLonfvYPo4j38+zBV93TkfNbxaZL4b6AXXV12Rx87HT+cFibMGQ+T6pjCCoX/BuLx4NeOHxZGl52sRsfswtULixlUHmjwElN5wQAh9RYVwveii/fVofxdUVtZULn9PZ1qzs6ppDPUPzg77l9F8VZoscICSYAASeEE3r17B37rtc4zIF9oGRZH/lHTHCqI21WiBp2WOklWKSUbX++ou3+AvCzYDzI9r3TuQvub1XPfpc3AMVJKLLhtvHrejfuDKJ7UyE8vBqNuuTC6uDj71B9tOfrzF5fAr4K63ZvrmzKbBTL7Oijz2xXndRCsFZadb8GtfwR3EKzrxzjum6Bss2UzClihNUobuFDlSpqrk+vjm0C4jm2vqrVX0Dq9OL+8GESD0XDyvn8WuVA/2jQKIN/Bbz3XIB92q2g1yz2EHqSykKpCJuVMobJcSZTWBJ+Nkj68hOhbjsxiUkaZEglquPrYg6/czkHiVzgdRrWiZ3vcbwftt8FJM589EsSCT/eRt0nr9rmq7g8JqEaWn5LykPfIlBr8/0j6CSH/QNq5vEPppqgq7S5d6BqLkuG5SrDJuksHcTiKBqdRbzKM4qv+aVSG9KQs336IloVVDU3q33V1zTcik8Cgdl1pu5m0bh8Xfv9jZ3mSBbzrseT2xuuhYZrnlivZqfwPWyZCj2KmpPdfKq3pVKNoYKmeofW862GF9cYbrXLspEovuJx50TdkQzeKd/bbyLahQMgS9VQZrBlUfqmM7ZT0OgOiUwiXVIe6OMjvxdW836HiK10Zz7vuV4FwU4LF5D+rTlYIy0lhUK8xNx2uOgFmBVSHC4+cRXNbae+xrq8cz+PdFPChpTKhQslDt0ahGBWQoOEak7pQdvzWbfsPUs8QLzGYBW/2SOArF+6CoRYg+ALBzrmBdvA2OHlLfg9YdlKPZXEcDbZbwObOB6Qu1XAHdQf2wXc9+Ldmxrtb3t292tr/tdxvV914XbYNZkvUpyrLqUZwE9yO0j+IfxwcB8f+PbRud42430/WsoLXnUSsoPYfJlsXYVij/kHRPXADs3Io0WDnVMJrpQG/FFSAVUdQxQS4SrYlZA9RAGbB85zLGTxyekF1MigM7oGvmcrHhEOY99T5Dfv+s8JTbwCbZfKI1J95bHj+g8NjGtdt7omifVDRAUCb+t20id5TN7Q1hMp4kkJZjDca3WfKZ4FVmQh0nhm6xB/dkS2fxfcITQOm7Cmm0BgXktWZX4VL/awEbsOFL5dMFAmWM4qd4/rZqQpanrlhQentyKo9S11BD2C4jt31lOa+qWzI3L9OlV/ekwRSOc4PXARdPY5TaH24HE960XAEocptOMuL7QvkJlTfa5XVgdCIqMx7lLacyHiWC8xQrgevbP3O9qCmcXz2LC3j+OxJDS9dg/hfAAAA///VCYQxERQAAA==
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
index 99bbec76280..12cbd2a2ab1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
index 99bbec76280..12cbd2a2ab1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
index 99bbec76280..12cbd2a2ab1 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
index b8886b4d800..9a6927731dd 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    H4sIAAAAAAAC/8RYW2/buPJ/96eYqgba7JZSnGL7B3brP+ATq63RxAlkO+chCAyaGtmsKVIlKbdu4u9+QEmWL3VSZ/cA5yVWyLn8Zjg38uWLYMJlMKFm1mggmynwBirXjMspMINjLo2lQoxjbqxWvplBojRcUs0laq/R0JiqBZ4raalbiV+fwH0DAIDVS9eUzekU+zTFtrdZ9goynsDtLTSvBuObMBr0rvrQboN35p96cHf3F9gZyoLuCZGpmizJvtyEFz8arV6yNB7zZJxQLnKN0DqFP+DdKcQygRI+kCU0D0pvrBqNygVdzExtXSyTcUrnyCibITw8AH7nFpphFI0718Px6LrbGYbjYe8yvBoNa448i6k9QN7tDRzPx6jT3WVyvnaMWYkIuARGCUNtecIZtWiAzZDNiUZjqbbAeGJIbrkwwITKY8Ilt4T+yDWS+SJzLpRWUzYnVilH5L4FnzgthOZWpdRyBjixdCLQANqZI4QkNwhTboFLZXmyrNi5sioDnmmVWwSeGbTAs4r3y1eYo5YoSIwLFCDUVCvrHCCMSkCmNCOSUQuyxpzRFDI+/QGZSblhoM3SCDUFoxydWRpjqQVnAJYqHRsRXObf4fsP+MEzmAg1cWjPQCYVEG6Y4YUnOLVKl7r+glhVkcUTeFG4uTppeHsKLXh3egrNLefvBePuCfb6g2Hn4mLn8OogjJXExjOj/cDJ0yyjOlWaZFQb1CD4ZL1UW71l1d+06zjLatsq66qVTbZ8ppbuZMzPpr9og9c6YPrjsOfUUlLBNmSmjP37h1KijdU3KRSNP16PupovUG8Av9z6+zmM+uHFGnm7+TqXNEUgGh7AYAyvTEACP5i+OinIz0fdTk3s/TZu3u8KWP3m1fHwiKksjylp3m9LWu0Y+2tTSwuZRmqxv+Axp4NlKricD1XHlbMFZ9hXMW5M7t/0ur3OuBvejM8/daK2Fwg+CfIYF4HOBRo/Dv6vRWQhyyU1YTOq/WKrrLpW5WwGXvN+T9Kq3HZJ/P49hFcf4P8PU3XOh85nbY/GsfcGuuHNdWf4qd32gklugozxIC6PKShReG8gGvV/b3tBbnTRySp0zM5dvbCYQumBGi8xpRcMEFJtUSG8Rnj1oTyUfypqKwtKt3+gE83ZJZV0ivonZ0e9mzDaCi2WWyAxECAJnMH79+/Ba77WWQrkKy3C4sQ7qZtDCXG7SlSgk0InSUulZOPrHXWrR8iLgv0o03GlcxfaP6ye+y6tB46hUmLObe3Vy07U64fRuEJ+ftUfdoqF4dXVxefecMvRX766BH7lV+3e3N4V2SyQ2dd+kd+uOK+DYK2w6Hxzbr0TeAB/XT9GUc/4RZstmpHPcq1RWt+FKlfS3Jzdnt75wnVse1OuvYLm+dXl9VU/7A8H4w+9i9CF+smmUQD5AV7zWIM82K2i5Sz3GHqQykKichkXM4VKMyVRWuN/MUp68BLC7xkyi3ERZUrEqOHmUxe+cTsDid/gfBBWio72uNfyW+/8s3o+eyKIBZ/sI2+R5v2xqlaHBJQjy7OkPOY9MqEG/zuSniHkf5B2Lu9QuimqTLtrF7rGomR4qWKss+7aQRwMw/552B0Pwuimdx4WIT0uyrcXoGVBWUPj6nddXbONyNg3qF1X2m4mzfunha9+7iy/ZIHG7Uhye9foomGaZ5Yr2S79D1smQpdiqmTj31Ra0y5HUd9SPUXbaNwOSqx3jeEyw3ai9JzLaSP8jmzgRvH2fhvZNhQIWaCeKIMVg8qulbHtgl6nQHQCwYLqQOcH+RtROe+3qfhGl6bRuO2VgXBXgMX4X8t2mgvLSW5QrzHXHa48AWYFlIcLT5xFfVtp7bGurxzH8W4K+MBSGVOh5KFbo1CMCojRcI1xVSjbXvO+9SepZoiX6E/9N3sk8I0Ld8FQcxB8jmBn3EDLf+efvSN/+Cw9q8ayKAr72y1gc+cDUpVqeICqA3vguR78tp7xHhYPD6+29n8v9ltlN16XbYPpAvW5SjOqEdwEt6P0T+Kd+qf+qbeC5v2uEav9ZC0qeNVJxBIq/2G8dRGGNeqfFK2AG5gWQ4kGO6MSXisN+DWnAqw6gTImwFWyLSF7iHwwc55lXE7hidPzy5NBYXAPfMVUPCYcwrynzqvZ958VfvUGsFkmT0h9zmPD8Q8OT2msb0mPKX/7XOWb5bMjFR9zHzyo7ACoTQOp+1T3V1fEdasvHUASKLrBRqP7TPjUtyoVvs5SQxf4s0vSxVF8T9DUYIqmZnKNUS5ZVXrKeK3etcBtuPzhkok8xmJIsjNcv3uVWcNTN60ovR3alWep6yg+DNbJsx4T3TeVNZn716nyiouaQCpH2YGbqGsIUQLNj9ejcTccDCFQmQ2mWb59g93kyget0iogahGleU/SFiMhTzOBKcr15JeuH/oe1TSKLo7SMooufqnhpetQ/wkAAP//qnnjMpIUAAA=
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData
index ed56f14a0ad..0a4887433ff 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/CustomData
+++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/MarinerV2+Kata/line61.sh b/pkg/agent/testdata/MarinerV2+Kata/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/line61.sh
+++ b/pkg/agent/testdata/MarinerV2+Kata/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
index ed56f14a0ad..0a4887433ff 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
index ed56f14a0ad..0a4887433ff 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
index ed56f14a0ad..0a4887433ff 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
index ed56f14a0ad..0a4887433ff 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -58,7 +58,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 - path: /opt/azure/containers/provision_configs.sh
   permissions: "0744"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh
index 019fbfb1f38..0de4ead33ef 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line61.sh
@@ -118,7 +118,10 @@ installStandaloneContainerd() {
         if [[ $OS_VERSION == "2.0" ]]; then
             containerdPackageName="moby-containerd-${desiredVersion}"
         fi
-
+        if [[ $OS_VERSION == "3.0" ]]; then
+            containerdPackageName="containerd2-${desiredVersion}"
+        fi
+        
         if ! dnf_install 30 1 600 $containerdPackageName; then
             exit $ERR_CONTAINERD_INSTALL_TIMEOUT
         fi
diff --git a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh
index 0661aa68cd8..f9c03cc0188 100644
--- a/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh
+++ b/spec/parts/linux/cloud-init/artifacts/cse_install_spec.sh
@@ -50,10 +50,10 @@ Describe 'cse_install.sh'
             OS="AZURELINUX"
             containerdPackage=$(readPackage "containerd")
             When call installContainerRuntime
-            The variable containerdMajorMinorPatchVersion should equal "1.7.13"
-            The variable containerdHotFixVersion should equal "3.fake"
+            The variable containerdMajorMinorPatchVersion should equal "2.0.0"
+            The variable containerdHotFixVersion should equal "1.fake"
             The output line 3 should equal "mock logs to events calling with AKS.CSE.installContainerRuntime.installStandaloneContainerd"
-            The output line 4 should equal "in installContainerRuntime - CONTAINERD_VERSION = 1.7.13-3.fake"
+            The output line 4 should equal "in installContainerRuntime - CONTAINERD_VERSION = 2.0.0-1.fake"
         End
         It 'skips validation if components.json file is not found'
             COMPONENTS_FILEPATH="non_existent_file.json"
diff --git a/spec/parts/linux/cloud-init/artifacts/test_components.json b/spec/parts/linux/cloud-init/artifacts/test_components.json
index 0730d7b28f0..4b6ddfebbc7 100644
--- a/spec/parts/linux/cloud-init/artifacts/test_components.json
+++ b/spec/parts/linux/cloud-init/artifacts/test_components.json
@@ -182,7 +182,7 @@
             "versionsV2": [
               {
                 "renovateTag": "<DO_NOT_UPDATE>",
-                "latestVersion": "1.7.13-3.fake"
+                "latestVersion": "2.0.0-1.fake"
               }
             ]
           }