feat: use kata-cc containerhost build metapackage

Azure · Jan 22, 2024 · de7917f · de7917f
1 parent 2a458eb
commit de7917f
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 70 deletions.
diff --git a/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh b/parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
@@ -27,11 +27,9 @@ installDeps() {
 
 installKataDeps() {
     if [[ $OS_VERSION != "1.0" ]]; then
-      for dnf_package in kernel-mshv hvloader mshv-bootloader-lx mshv cloud-hypervisor cloud-hypervisor-cvm moby-containerd-cc kata-containers kata-containers-cc kernel-uvm kernel-uvm-cvm; do
-        if ! dnf_install 30 1 600 $dnf_package; then
-          exit $ERR_APT_INSTALL_TIMEOUT
-        fi
-      done
+      if ! dnf_install 30 1 600 kata-packages-host; then
+        exit $ERR_APT_INSTALL_TIMEOUT
+      fi
     fi
 }
 

diff --git 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 |
-    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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/line61.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh
@@ -26,11 +26,9 @@ installDeps() {
 
 installKataDeps() {
     if [[ $OS_VERSION != "1.0" ]]; then
-      for dnf_package in kernel-mshv hvloader mshv-bootloader-lx mshv cloud-hypervisor cloud-hypervisor-cvm moby-containerd-cc kata-containers kata-containers-cc kernel-uvm kernel-uvm-cvm; do
-        if ! dnf_install 30 1 600 $dnf_package; then
-          exit $ERR_APT_INSTALL_TIMEOUT
-        fi
-      done
+      if ! dnf_install 30 1 600 kata-packages-host; then
+        exit $ERR_APT_INSTALL_TIMEOUT
+      fi
     fi
 }
 

diff --git 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 |
-    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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=false/line61.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh
@@ -26,11 +26,9 @@ installDeps() {
 
 installKataDeps() {
     if [[ $OS_VERSION != "1.0" ]]; then
-      for dnf_package in kernel-mshv hvloader mshv-bootloader-lx mshv cloud-hypervisor cloud-hypervisor-cvm moby-containerd-cc kata-containers kata-containers-cc kernel-uvm kernel-uvm-cvm; do
-        if ! dnf_install 30 1 600 $dnf_package; then
-          exit $ERR_APT_INSTALL_TIMEOUT
-        fi
-      done
+      if ! dnf_install 30 1 600 kata-packages-host; then
+        exit $ERR_APT_INSTALL_TIMEOUT
+      fi
     fi
 }
 

diff --git 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
@@ -26,11 +26,9 @@ installDeps() {
 
 installKataDeps() {
     if [[ $OS_VERSION != "1.0" ]]; then
-      for dnf_package in kernel-mshv hvloader mshv-bootloader-lx mshv cloud-hypervisor cloud-hypervisor-cvm moby-containerd-cc kata-containers kata-containers-cc kernel-uvm kernel-uvm-cvm; do
-        if ! dnf_install 30 1 600 $dnf_package; then
-          exit $ERR_APT_INSTALL_TIMEOUT
-        fi
-      done
+      if ! dnf_install 30 1 600 kata-packages-host; then
+        exit $ERR_APT_INSTALL_TIMEOUT
+      fi
     fi
 }
 

diff --git 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"