fix: remove redundant logs from aks-log-collector.sh, adding missing …

…"exit", mask nftables.service on AzureLinux 2.0 (#5733)

Co-authored-by: Cameron Meissner <[email protected]>

parts/linux/cloud-init/artifacts/aks-log-collector.sh

@@ -191,7 +191,7 @@ zip -DZ deflate "${ZIP}" /proc/@(cmdline|cpuinfo|filesystems|interrupts|loadavg|
 collectToZip collect/file_listings.txt find /dev /etc /var/lib/waagent /var/log -ls
 
 # Collect system information
-collectToZip collect/blkid.txt blkid
+collectToZip collect/blkid.txt blkid $(find /dev -type b ! -name 'sr*')
 collectToZip collect/du_bytes.txt df -al
 collectToZip collect/du_inodes.txt df -ail
 collectToZip collect/diskinfo.txt lsblk

parts/linux/cloud-init/artifacts/cis.sh

@@ -185,7 +185,7 @@ function maskNfsServer() {
     # Note that on ubuntu systems, it isn't installed but on mariner/azurelinux we need it
     # due to a dependency, but disable it by default.
     if systemctl list-unit-files nfs-server.service >/dev/null; then
-        systemctl --now mask nfs-server || $ERR_SYSTEMCTL_MASK_FAIL
+        systemctl --now mask nfs-server || exit $ERR_SYSTEMCTL_MASK_FAIL
     fi
 }
 

parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh

@@ -11,6 +11,15 @@ removeContainerd() {
 }
 
 installDeps() {
+    # The nftables package turns on a service by default that tries to load config files,
+    # but the stock config files in the package have no uncommented lines and make the service
+    # fail to start. Masking it as it's not used, and the stop action of "flush tables" can
+    # result in rules getting cleared unexpectedly. Azure Linux 3 fixes this, so we only need
+    # this in 2.0.
+    if [[ $OS_VERSION == "2.0" ]]; then
+      systemctl --now mask nftables.service || exit $ERR_SYSTEMCTL_MASK_FAIL
+    fi
+
     dnf_makecache || exit $ERR_APT_UPDATE_TIMEOUT
     dnf_update || exit $ERR_APT_DIST_UPGRADE_TIMEOUT
     for dnf_package in ca-certificates check-restart cifs-utils cloud-init-azure-kvp conntrack-tools cracklib dnf-automatic ebtables ethtool fuse git inotify-tools iotop iproute ipset iptables jq kernel-devel logrotate lsof nmap-ncat nfs-utils pam pigz psmisc rsyslog socat sysstat traceroute util-linux xz zip blobfuse2 nftables iscsi-initiator-utils; do

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"

pkg/agent/testdata/AzureLinuxV2+Kata/line61.sh

@@ -11,6 +11,10 @@ removeContainerd() {
 }
 
 installDeps() {
+    if [[ $OS_VERSION == "2.0" ]]; then
+      systemctl --now mask nftables.service || exit $ERR_SYSTEMCTL_MASK_FAIL
+    fi
+
     dnf_makecache || exit $ERR_APT_UPDATE_TIMEOUT
     dnf_update || exit $ERR_APT_DIST_UPGRADE_TIMEOUT
     for dnf_package in ca-certificates check-restart cifs-utils cloud-init-azure-kvp conntrack-tools cracklib dnf-automatic ebtables ethtool fuse git inotify-tools iotop iproute ipset iptables jq kernel-devel logrotate lsof nmap-ncat nfs-utils pam pigz psmisc rsyslog socat sysstat traceroute util-linux xz zip blobfuse2 nftables iscsi-initiator-utils; do

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"

pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line61.sh

@@ -11,6 +11,10 @@ removeContainerd() {
 }
 
 installDeps() {
+    if [[ $OS_VERSION == "2.0" ]]; then
+      systemctl --now mask nftables.service || exit $ERR_SYSTEMCTL_MASK_FAIL
+    fi
+
     dnf_makecache || exit $ERR_APT_UPDATE_TIMEOUT
     dnf_update || exit $ERR_APT_DIST_UPGRADE_TIMEOUT
     for dnf_package in ca-certificates check-restart cifs-utils cloud-init-azure-kvp conntrack-tools cracklib dnf-automatic ebtables ethtool fuse git inotify-tools iotop iproute ipset iptables jq kernel-devel logrotate lsof nmap-ncat nfs-utils pam pigz psmisc rsyslog socat sysstat traceroute util-linux xz zip blobfuse2 nftables iscsi-initiator-utils; do

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"

pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line61.sh

@@ -11,6 +11,10 @@ removeContainerd() {
 }
 
 installDeps() {
+    if [[ $OS_VERSION == "2.0" ]]; then
+      systemctl --now mask nftables.service || exit $ERR_SYSTEMCTL_MASK_FAIL
+    fi
+
     dnf_makecache || exit $ERR_APT_UPDATE_TIMEOUT
     dnf_update || exit $ERR_APT_DIST_UPGRADE_TIMEOUT
     for dnf_package in ca-certificates check-restart cifs-utils cloud-init-azure-kvp conntrack-tools cracklib dnf-automatic ebtables ethtool fuse git inotify-tools iotop iproute ipset iptables jq kernel-devel logrotate lsof nmap-ncat nfs-utils pam pigz psmisc rsyslog socat sysstat traceroute util-linux xz zip blobfuse2 nftables iscsi-initiator-utils; do