diff --git a/parts/linux/cloud-init/artifacts/cse_main.sh b/parts/linux/cloud-init/artifacts/cse_main.sh index b259edb0bf7..2470392bbd9 100755 --- a/parts/linux/cloud-init/artifacts/cse_main.sh +++ b/parts/linux/cloud-init/artifacts/cse_main.sh @@ -301,7 +301,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/parts/linux/cloud-init/artifacts/mariner/mariner-package-update.sh b/parts/linux/cloud-init/artifacts/mariner/mariner-package-update.sh new file mode 100755 index 00000000000..555b941867e --- /dev/null +++ b/parts/linux/cloud-init/artifacts/mariner/mariner-package-update.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +# source dnf_update +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +# At startup, we need to wait for kubelet to finish TLS bootstrapping to create the kubeconfig file. +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +# retrieve golden timestamp from node annotation +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +# update current timestamp +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/parts/linux/cloud-init/artifacts/mariner/package-update.service b/parts/linux/cloud-init/artifacts/mariner/package-update.service new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/parts/linux/cloud-init/artifacts/mariner/package-update.service @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImageKata/line135.sh b/parts/linux/cloud-init/artifacts/mariner/package-update.timer similarity index 63% rename from pkg/agent/testdata/CustomizedImageKata/line135.sh rename to parts/linux/cloud-init/artifacts/mariner/package-update.timer index 2f855de5428..f73ba22284e 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line135.sh +++ b/parts/linux/cloud-init/artifacts/mariner/package-update.timer @@ -1,5 +1,5 @@ [Unit] -Description=Runs snapshot update script periodically +Description=Runs package update script periodically [Timer] OnBootSec=10min diff --git a/parts/linux/cloud-init/nodecustomdata.yml b/parts/linux/cloud-init/nodecustomdata.yml index 01985cee44a..4c62dfa9e67 100644 --- a/parts/linux/cloud-init/nodecustomdata.yml +++ b/parts/linux/cloud-init/nodecustomdata.yml @@ -134,6 +134,28 @@ write_files: content: !!binary | {{GetVariableProperty "cloudInitData" "migPartitionScript"}} +{{if IsMariner}} +- path: /opt/azure/containers/mariner-package-update.sh + permissions: "0544" + encoding: gzip + owner: root + content: !!binary | + {{GetVariableProperty "cloudInitData" "packageUpdateScriptMariner"}} + +- path: /etc/systemd/system/snapshot-update.service + permissions: "0644" + encoding: gzip + owner: root + content: !!binary | + {{GetVariableProperty "cloudInitData" "packageUpdateServiceMariner"}} + +- path: /etc/systemd/system/snapshot-update.timer + permissions: "0644" + encoding: gzip + owner: root + content: !!binary | + {{GetVariableProperty "cloudInitData" "packageUpdateTimerMariner"}} +{{- else}} - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -154,6 +176,7 @@ write_files: owner: root content: !!binary | {{GetVariableProperty "cloudInitData" "snapshotUpdateTimer"}} +{{end}} - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/const.go b/pkg/agent/const.go index bd4c0a09ab2..4b1fffcac73 100644 --- a/pkg/agent/const.go +++ b/pkg/agent/const.go @@ -67,6 +67,9 @@ const ( snapshotUpdateScript = "linux/cloud-init/artifacts/ubuntu/ubuntu-snapshot-update.sh" snapshotUpdateSystemdService = "linux/cloud-init/artifacts/ubuntu/snapshot-update.service" snapshotUpdateSystemdTimer = "linux/cloud-init/artifacts/ubuntu/snapshot-update.timer" + packageUpdateScriptMariner = "linux/cloud-init/artifacts/mariner/mariner-package-update.sh" + packageUpdateSystemdServiceMariner = "linux/cloud-init/artifacts/mariner/package-update.service" + packageUpdateSystemdTimerMariner = "linux/cloud-init/artifacts/mariner/package-update.timer" migPartitionScript = "linux/cloud-init/artifacts/mig-partition.sh" migPartitionSystemdService = "linux/cloud-init/artifacts/mig-partition.service" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index a06afa3c461..caa5d178d42 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Containerd/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+Containerd/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 92a47e4bc56..772d23437bc 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 92a47e4bc56..772d23437bc 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index b915b86a2e5..b2cf38e49f7 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index b915b86a2e5..b2cf38e49f7 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9Q7a3Pbtpbf+StQXk0evaUeTuI26VXuMCItc6zX8uFuts1yKBKSsKYABgAV+6be374DgKQomZJlb/fDaiaRCB4cnPc5OID/9kNnjnBnHrGVZrtueOGM7PA30x9chr4ztqeB3z8HGoMcGLcaWoDfgbEAHZLxTvSvnMJOTDCPEIaUdTJKNoghgtsxWWcp5BB8+RXwFcQakB8YrwjQzZTCKLkDNMKAE8DyOIaMAXiLOMLLdrutl+C3iIOutkCaFmV8HdGb38wRwvmtuYSYgxVJE/BC00bTYWg5br+ziWgnJcuCsOiGaeubBFFgZKD1vYC611IMDAb2gOM0ZxxSY8tCSpbgj4KQx4CNmEGD5DzL+e68rZh+bP8XI7jpTZySPDEQRtxYoBSydhZtYNIEuVkJOMajNN1KuITbctjRtOyOrwh+85ieQgqTKOahJCGMCV6gZTu7K3AahiJNjRtZxFeFJNBcUd2R1OC4ZKLAwG95hUJJRU2ukbgPr2nBp2DiB6Frj2zTs/utVymbhxSmMGIQGBQY7LU0v99B6/su7D3o94HeO2933+rgS93iWJ4QEGXcWArzvQNRzgmFa7KBIF5Rgu+0yipb/9zOYHeMw3XMU0Ah4xHlxUhicLSG7A7HiTRKNfFVEnH4+qfWqxVhHEdr+PonIGfFOeNkzWKKMv7xo1TFWtMWhAIEEAatVwx+BT3w5rzbff0rSIgkQHkYA3rr+8Czw0t7NLNdT3rlzPQv7/U9lwJgSWEGjIuv4OXfCmh7evHyCIIXL8CcwuhGYlig7bItBAz4VRL0YBXpi63mAKGkmDJYQbMUwgz0yhUSgqHGYAIMBPROjcxOoh8mVGMkpzE8ArAHYTme704fx+RMPN8cjQ4DFIgehRtMJxfOcIciZaJ667vleOankR16npC5sFBOc7hnoAli0TyFnncJ/vyzJuPa5K2l6RlFm4hDAJdUBMyMkts7ECWJfEIMvGx9n7nOtenboT10bc8LZ+703z+HpmWJp/uXdfq8y2kwsgoWAtcOL31/piYcpveU2eHAPIxAfJTX5xSKOTPBxMDcZT+YWYKJgRkObNf36oZaTbZ5bOMNogSvIeZSSkeYGwSePx0LjL4beP5hAiv8A+m9g2gAKUcLFAvBHyVSUKAIMLCgYRr4n6bBRFAxHpsT675RlgpWCe7adL19KOlamygFrS1MXR4UcnoXr5MQLcJFhNKcQvCuC3rgHWjtUwA+fnxyKjv7+KK3y3cN62QSXpjO6FfJe+EaHcjjDmFGEbq1Kmg71j34oQ/0dURFGtrjU1m4K4IzwkuwjrCRzGXANvJMRFiwSKMlEBmyqhBSsmQhJyHcQMwZ0M0rrz3w7LYK8eMIW3Mz5ySQ8y/SaHmBUqiDo6+Vu91mhHJR6LAVydMkZDcoC/EGJSgKE4o2kDLt4VhYJOd+61WDWkJMQsYjzkBP6KfXBaLmAkZ8e2SV1xqFvN/6Z2XaFHJdirHbKMCLCKUwEWVVAjmka4ShMDSFFCikoCCzWBbMIRArZzBRYt2qenLtWI4ZWq5zbbtlOKwZut76PpwF4WRq2feKqtKjhMkogMNiOuyEhxQbpzDCQTacBZYSjw4eDEnyDiEo461K5y5kJN3ARAfN44fxVFHCTNYIB0yY88MxTbu+tMLRdLjNRf1Hyrmqwm49mAoealvoOOYwAUuSJhADtI6WEGQUlniP+0khu0FZGTpi+lame+MS1UUwGlV50bX/LXBc2+ovIpH8qwqgMg7HC68vReDrA6Hlhsgm2QiYcPnrS0vogVMC5jmXnt4kBUw4WJAcJ3pDbSLAZX0ymfrhhYhS9VjZTLygrGbTraknzLJV1JhTL5yYY1uY9IsXQHDViEWwWFryCYZcqMeCGdNB7WErQyWZYU2vvyovFaJKYAZxAnGMICunRxwRrB+1/gKy0qubY1HQVhTsv1DGqLe+T2zb8kS8901nYrvWrueWgvnu2yN7NnX90J6I6mUPTIkFnCIXH6ZQROBkluZLhCsC98ZV2oE8zwYTx0KUPcr6BPJvhN7sod0Z1SquHS+8EsXCyPabODnKSEK+4ZREyRXNGU9FzC5HKiEnv0Vs7a3QmlXWJ1ZVsgs9eyDqFn/khZ+mU9/zXXM2cybDZ1PiwTin0B95nwjhjNMou8rnMIXcvoVxKZAnAEuiXVsQtxcHjuyLdE9up8pQKWx5OAuKvMT0xrRSxQ5pZ4/nlB+ellMgZjmF9ZSyP7Ib0wr9CAIt+9oZ2OFsFAydSehchMJP7GPxrsIydoYVf/W0qVg0FkCXdVSx7yy+O4plI4EbFEMjk3poM0jFY0PdKD5VB+TJCNu1CCs+HMLnIOn0usYaLUNhRRwu72Tu1MFH0EngpoPzNAX/+MdLsWXVfvfUpC9arbLv60JWwv59e/i5bwhkRokMiMyRQl0Tdiltq1/72cmZqHXjKC1olJ2uJnJBq76I4FazpxcV+0X+OGZGcsffbsKtA71qKNhYlBkmTpQfNIPvVNsP7czzTdeXdffDffdh6kj2KHGWKoIkdSRrJq5Mp7s+Ib1V5ogL85PrDMKxOTGHtnt8H7ibb8emK3JLLeE2WPNj4V2SfBHNKYrHEY6Woi47/O4p+i2ksZDz1yXuxzS7B/5Qs7Ky9vZ1+kDAB8LFnoT2orEsbMp3jzKoot4YLWcR5UgWE+DhWEne8faXbuPkcJDfKyus6eDKdkWV50wOZjcGOfj7reqZkPgGUsEHwsDIQcuzXeUfrjMZODNzFA5Gjj3xQ8eSrd+D7z174Nq+oMT8D5Fsy+aJaw8dz3c/h2KmsOKKBOP2lAKryJXiK+apiRPxSzY6Kms8DKJpMYURh2JgHGG0gIxbiG6ldml6ZTvDs013cBla07F5RHZ663sTfL0l+PFAp1gWV4ZqZBoMRjReGQlZRwgfaA40LeQpw5YdmuPp6EZJpZ6BHt+CXf3Capuvq1+OVIHb5s7Eqc0ZTJxa1Te7Pg+twBwJpxxcHatlT6grrMvBbHNeepJ62in3jpfWJ6+zrSrLtbYjYLureIRY6VkVsfJpd7c/tj3PHNrh9CL0L+3QMj8XBVdjM+IA/J9gHjF4/hYYiTA8YQdrwpPdlXzTHdp+OBhNg1ImprDOwQrhaJCSPNlbkkIeLccDV21WLwiVkLtIi9rtcur5Xtm8NYf25Eg/8LgpzVRHdqC6aJeE8coWG17tKH6nRRn6rjnxZqYrwtJlMLTDmTm0n2wLlUX7NMIsiyjE/DJfwlm0hDV7b3h7hDTvN3MmY8XzyfG+RZnqvT0YanKGoTsNZtdnB9c7WIk+iB+i+IyXlOTZ5qyx8BRV3oGy8yr4ZI+ECUpywouROfT6RoHOUNmsXxCgy3LxWX5dRUTJUBV7kx0/ErRMbD/07fFsZPp2sxdtJ0tJYMhDDtdZGnEomdeeI70KpyHWMxZptHx6CV/JspJHJU+qeg0GhV9zyLg8YiM57/ferYGxXb6CgzjJCMK8n2N0+6HT6dAc1znf/mwzEt+A7QpKc6xf8NtmKYrhDnyxk6pq/7II+wEwuN5AOiBr4TZAKcSd2L7thaKAc6aTD4bebXfbXf0e6L322c/trr5Xnj1T8BX9f5HoQzeY+M7YlhroN4i4T+Ga8JoYinqvXoCUWC3Huwr9z7PDweFpXM8RTtYkx/ywtwYY8S+aC7/miELWFzMMNaXApJkLDmnTi9JJj6dB747FPC3ToHo61bHFBr4piNYMPxg5Y8f3Dgjs4A4O8m1GD1K0Rrxe9jx4dwKfRQ1aMlo81hpRniiKJ9PQCmaiOJ6OHW8QTAMv/OQ61jPSk1pnQqw8m+IZJWvE4vwTRYnITkdentKdPWH5fJ5jnns4ytiKcHXsU2l5Z7RcsLnX++AM7xSiqmh+liS9GPZ+Nro/v4fG2+6b2Ji/eXdmRL33Zz0Iz7o/QyjMnt2xzjxnnc1a/F9snjqrTZhzlHZyLMx7e95enK333qA//vJV/sC6yi80bstuSj0oXJsjxzJ9ZzoJbdftdzXNnDnFxkmdELq27zq213/XLXVYg5CC6vfBj+3icDtF+Kb9467sDmHsdeXlIBmg5RHjHuJ70P9v8J+/d433X/7+R7v5u3VwKWvi7axU0/dTGTiM+KxAXLuG8WileqDBqToAXr/16pADRBkSkRDSCUsJuckzHehN58c7gqxRew964KwLcDEbVLn6HTAknn63QQn664o8z/f6xUWbnbaVGG+QQ8vzPcFt9yGjYuUtIQ8X3W8yubZ00R/13vkv7fM37d7Z+3bvXP8RNPeZ9qxabm2vfvHC2jKqZSCkM5pOr0SBWHZvHrB3IsZDuAqZnNTo26p4cIpy6+50rw6lcQyMzb+anOnt2zeyhaVkfwxMQJ3AcHWBoFT9o/vU/6fs1fLXidcgZA/osYsQIMIJuEHxjQAki0UJXMBllMiLlREvu3SqkaX6S4fuPwgI2TifI9xZRziZi5pG0VXgXyCM2AomxUI7K4AXVfLcbUfuM/mSwjkhHFBVyCU/ATUgeMEkgQBh0ANrhHMOXyqqynuqwIiBzlY5T8g3DAwKeuCF/ox83HSpNMfFtdJ9k3wa6r3TvGBi+r49sWwrDGZD17TsQ/Xf9hMEZeC3HLevSugo4+KfLI7bSef9+wxSRBIU6wcOfVqvEkRxtJZX1nYw3uuv9853SB6vGsB2gOLVmiSge/727WOQSsnmzP/wYVYQ+eGDsjVjFsU30RIaI8SEd/f0X1+Cjx+fhxFHnEOcwMQIsiWNEngyvu01zxyvI3Yjb4omEUrvyg3DdsTIFfJqK9GMCMpTgP8LRCIq0QY0cvwAkvL2qmFgYsxTsRs+EWEd33OQNzHXdNryqAfC9ImnRH+B49XP/03ffBR+a5vqEGhrkqVFIiavrbA8ywjlMAHzO3AT8Uhd7GA/gW8oTSXIHBaqT17u2v5+PbGrjOL+EkjwwhCpYh1xFBuYcLS4I7jU9hEEjJPs+bML/9mdX15tKl1g55zA++z59njgj/aPvp6xgLLY/wX6vbO7v26VmqUXP+tHZ7q6YgrUDfEqq7bFXgGoMkds8DGMOSIYxCsY34CYJPCDDlq79ceRsziIk8aL6Nu+Y9PJj8j5KiGc+qcemqYEs0eYpv3Nnl78TwAAAP//tXl5uWUyAAA= + H4sIAAAAAAAA/9Rbe3fbtpL/n58C5dXJo7fUw0ncJr3KPYxIyzzWa0nK3Wyb5aFISMKaAhgAVOybej/7HgAkRcmkZHu7f6zPaW1Bg8HMYB4/DJC//dBZINxZhGyt2a4bXDgjO/jN9AeXge+M7enc758DjUEOjFsNLcHvwFiCDkl5J/xXRmEnIpiHCEPKOiklW8QQwe2IbNIEcgi+/Ar4GmINyB8YrQnQzYTCML4DNMSAE8CyKIKMAXiLOMKrdrutF+S3iIOutkSaFqZ8E9Kb38wRwtmtuYKYgzVJYvBC00bTYWA5br+zDWknIatcsPCGaZubGFFgpKD1Pae61xIMDAYOiKMkYxxSY6dCQlbgj1yQU8RGxKBBMp5mfH/ezkw/tv+LEVz3TZSQLDYQRtxYogSydhpuYVxHuV0LOsbDJNlZuKDbadjRtPSOrwl+c2qfAgrjMOKBFCGICF6iVTu9y3kahhJNjRtpyNe5JdBCSd2R0uCoUCLnwG95yUJZRU2uiHhIr2nzT/OJPw9ce2Sbnt1vvUrYIqAwgSGDwKDAYK+l+/0OWt/3ae9Bvw/03nm7+1YHX6oex7KYgDDlxkq47x0IM04o3JAtBNGaEnynlV7Z+uduBrtjHG4ingAKGQ8pz0dig6MNZHc4iqVTqomv4pDD1z+1Xq0J4zjcwNc/ATkryhgnGxZRlPKPH+VWbDRtSShAAGHQesXgV9ADb8673de/gphIAVSEMaC3vg88O7i0RzPb9WRUzkz/8l4/CCkAVhSmwLj4Cl7+Lae2pxcvjzB48QIsKAxvJIcl2i3bQsCAX6VAD1aRsdiqTxDKigmDJTVLIExBr1ghJhhqDMbAQEDvVMTsxHqzoBojGY3gEYIDCsvxfHd6mpMz8XxzNGomyBmdpBtMJxfOcE8i5aJ667vleOankR14nrC58FBOM3jgoDFi4SKBnncJ/vyzYuPK5J2n6SlF25BDAFdUJMyUkts7EMax/IQYeNn6PnOda9O3A3vo2p4XzNzpv38OTMsSn+5fVuXzLqfzkZWrMHft4NL3Z2pCs7yPmR0MzGYG4kdFfUahmDMTSgzMffXnM0soMTCDge36XtVRy8k2j2y8RZTgDcRcWumIcoO550/HgqPvzj2/WcCS/0BG7yAcQMrREkXC8EeFFBIoAQwsZJjO/U/T+URIMR6bE+u+1paKVhnu2nS9QyoZWtswAa0dTdUeFHJ6F23iAC2DZYiSjELwrgt64B1oHUoAPn58cik7+/iit693hetkElyYzuhXqXseGh3Iow5hRp66tTJpO9Y9+KEP9E1IRRk60FN5uCuSM8IrsAmxES9kwjayVGRYsEzCFRAVskQICVmxgJMAbiHmDOjmldceeHZbpfhxiK2FmXEyl/MvknB1gRKog6Nfq3C7TQnlAuiwNcmSOGA3KA3wFsUoDGKKtpAy7eFYkBfnfutVzbYEmASMh5yBntifXhcIzAWM6PbIKq81Cnm/9c/StSnkujRjt9aAFyFKYCxgVQw5pBuEoXA0xRQopiAXM18WLCAQK6cwVmbdbfXk2rEcM7Bc59p2i3RYcXS99X04mweTqWXfK6mKiBIuowiazdQchE0bGyUwxPN0OJtbyjw6eDAkxWtiUORbVc5dyEiyhbEO6seb+ZRZwow3CM+ZcOeHY5p2fWkFo+lwV4v6J+BcibBbD6aCh7st9jjiMAYrksQQA7QJVxCkFBZ8j8dJbrtBgQwdMX1n04NxyepiPhqVddG1/23uuLbVX4ai+JcIoHQOxwuuL0Xi6wOxyzWZTaoxZyLkry8tsQ+cErDIuIz0OitgwsGSZDjWa7CJIJf4ZDL1gwuRpaq5sl54IVnFp1tTT7hlK8eYUy+YmGNbuPSLF0BoVctFqFh48iMcOd8eC6ZMB5UPOxsqywwr+/qrilJhqhimEMcQRwiyYnrIEcH6Ue/PKct9dTMsAG0pweEXyhn11veJbVueyPe+6Uxs19qP3MIw3317ZM+mrh/YE4FeDsiUWcBj7OLDBIoMHM+SbIVwKeDBuCo7kGfpYOJYiLKTqk8g/0bozQHbvVGt1NrxgisBFka2X6fJUUVi8g0nJIyvaMZ4InJ2MVIaOf4tZBtvjTas9D6xqrJd4NkDgVv8kRd8mk59z3fN2cyZDJ8tiQejjEJ/5H0ihDNOw/QqW8AEcvsWRoVBnkAshXZtIdxBHjhyLtI9eZwqUqXw5eFsntclpteWlTJ3SD87XVN+eFpNgZhlFFZLyuHIfk7L90cIaNnXzsAOZqP50JkEzkUg4sQ+lu9KLmNnWOpXLZtKRWMJdImj8nNn/rujVDZiuEURNFK5D20GqfhYgxvFT9kBeTLDdiXDih8O4XOYdHpdY4NWgfAiDld3snbq4CPoxHDbwVmSgH/846U4smq/e2rSF62C7Pu6sJXwf98efu4bgplRMAOiciRQ14RfSt/qV/7sZExg3ShMchllp6tOXNCqLiK01ezpRal+Xj+OuZE88bfreOtALxsKNhYww8SxioN68j20/dDPPN90fYm7H567m6Uj6UnhLAWCpHQkrReuKKf7MSGjVdaIC/OT6wyCsTkxh7Z7/By4X2/HpitqS6Xg1njzqfQuRb4IFxRF4xCHK4HLmr97yv7m1ljK+ZuC96mdPSB/uLMSWXuHe/rAwA3p4sBCB9lYApviu5MKqqw3RqtZSDmSYAI8HCvEO97+0m0cNyf5A1hhTQdXtitQnjNprG4McvD3W9UzIdENpEIPhIGRgZZnuyo+XGcycGbmKBiMHHviB44lW7+N33v2wLV9IYn5H6LYFs0T1x46nu9+DsRM4cWlCMbtYwBWXivFr4gnJo7FX7LRUXpjM4mmRRSGHIqBcYjREjJuIbqz2qXpFe0MzzbdwWVgTcfmEdvpre919NWW4MeGTrEEV4ZqZBoMhjRaGzHZhAg3NAfqFvKUY8sOzfFydKOsUq1Ap49gV7+wyuHr6pcjKHDX3Jk4lTmDiVNBfbPr88CamyMRlIOrY1j2EbjCuhzMtudFJKlPe3DvOLR+9Do7VFmstRsBu1PFCWFlZJXCyk/7p/2x7Xnm0A6mF4F/aQeW+TkHXLXNiAb6P8EiZPD8LTBi4XjCDzaEx/sr+aY7tP1gMJrOC5uYwjsHa4TDQUKy+GBJCnm4Gg9cdVi9IFRS7jPNsdvl1PO9onlrDu3JkX7gcVeaqY7sQHXRLgnjpS/WfLW38XstysB3zYk3M12Rli7nQzuYmUP7yb5QerRPQ8zSkELML7MVnIUrWPH3mm+PiOb9Zs5krni+ON63MFW9twdDdcEwdKfz2fVZ43qNSPRB/hDgM1pRkqXbs1rgKVBeA+y8mn+yR8IFpTjBxcgcen0jZ2eoatbPBdAlXHxWXJcZUSpU5t54L46ELBPbD3x7PBuZvl0fRbvJ0hIY8oDDTZqEHErltedYr+RpiPWMZRKung7hS1uW9ijtSVWvwaDwawYZl1dsJOP93rsNMHbLl3QQxylBmPczjG4/dDodmuGq5rs/24xEN2C3gto51s/1bbMERXCPPj9Jldi/AGE/AAY3W0gHZCPCBqgNcSe2b3uBAHDOdPLB0Lvtbrur3wO91z77ud3VD+DZMw1fyv8XmT5w5xPfGdtyB/o1Ju5TuCG8YoYc71UBSMHVcryrwP88a04OT9N6gXC8IRnmzdE6x4h/0Vz4NUMUsr6YYagpOSfNXHJI674ogvR4GfTuWMSTogyqT48NbHGAr0uiFcefj5yx43sNBms8wUG+q+jzBG0Qr8KeB989Qs8cgxaK5h8rjShPgOLJNLDmMwGOp2PHG8yncy/45DrWM8qTWmdCrCyd4hklG8Si7BNFsahOR758VHdWXTg86jTZJF+2yDDPPBymbE24uhcq3WBvtJCovhn84JKvUeq6dvhZHPci2PvZ6P78Hhpvu28iY/Hm3ZkR9t6f9SA86/4MoYgLdsc6i4x1thvx//x01Vlvg4yjpJNh4f+7C/n88r33Bv3xl6/yB9ZVAaJRW7Zbqlnj2hw5luk700lgu26/q2nmzMlPVuoK0bV917G9/rtusckVCmmofh/82M5vvxOEb9o/7tuuiWOvK18PyQwu7yAPGN+D/n+D//y9a7z/8vc/2vW/W41LWRNvb6XKfj9VgWbGZznjyjuNk1C2oQOqWgRev/WqKQDCFIlUCemEJYTcZKkO9LoL5j1DVqS9Bz1w1gU4nw3KYv4OGJJPv1uzCfrrUjzP9/r5S5y9vpYYr7FDy/M9oW33oaJi5Z0gDxc97EK5tgzRH/Xe+S/t8zft3tn7du9c/xHUN6IOvFqefa9+8YLKMqqnIKwzmk6vBIIs2jsP1HskxyZeuU0e1QncbfHgMZtbDad7dWuNI2Bs/1UXTG/fvpE9LmX7Y2SC6hEKly8Miq0/eZD9f6pepcA98p2EbBKdeikBQhyDGxTdCEKyXBbEOV1KiXx5GfKijac6XaoB1fRAQlDIzvoC4c4mxPFCgB4lV85/iTBiaxjnC+2tAF6UxXO/X3mo5EsKF4RwQBXSi38CakDogkkMAcKgBzYIZxy+VFIVD1mBEQGdrTMek28YGBT0wAv9GfW47tVphvN3p4cu+TTWB9d984np+/bEsq1gPhu6pmU3AcTdz3xeJH7LcfsKY4cpF/9J9NyOO+/fp5AiEqNIb7gVar2KEcXhRr5p2+N4r78+uAAiWbSuIdsjitYbEoPu+du3pyjVJpsz/8OHWS7khw/K14xZGN2EK2iMEBPR3dN/fQk+fnweRxxyDnEMY2OermgYw0fz270DzfAmZDfyKWkcouSuOFHsRoxMMS/PGvWMoLwm+L9gJLISrWEjxxuYFM9bDQMTY5GI4/IjGVb5PYd5nXJ11zEnIxAmT7xG+gsCr/pAwPTNk/Q731S3RDuXLDwSMfmuhWVpSiiHMVjcgZuQh+rlB/sJfENJIkkWMN/6+OW+7x/iif3NyB84gRgvDVEqNiFHkYEJR8s7govdPsKAcZI+f3YeP/vzi7dPRQjsXSR4nz3fHg/80eHd2DMWUB77v2B/cLn3161S8fT8z+rdmq7eoAL1hLysqm1xVgAK5oCIYAwjjggG0RpGNyAiMfygg9Y+/jhyWQdxXPtSfdeYrLsaEjVfFYTH/lsQTVOGORBM0/5mTy/+JwAA//9dgNZDhjIAAA== - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index a06afa3c461..caa5d178d42 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9Q7a3Pbtpbf+StQXk0evaUeTuI26VXuMCItc6zX8uFuts1yKBKSsKYABgAV+6be374DgKQomZJlb/fDaiaRCB4cnPc5OID/9kNnjnBnHrGVZrtueOGM7PA30x9chr4ztqeB3z8HGoMcGLcaWoDfgbEAHZLxTvSvnMJOTDCPEIaUdTJKNoghgtsxWWcp5BB8+RXwFcQakB8YrwjQzZTCKLkDNMKAE8DyOIaMAXiLOMLLdrutl+C3iIOutkCaFmV8HdGb38wRwvmtuYSYgxVJE/BC00bTYWg5br+ziWgnJcuCsOiGaeubBFFgZKD1vYC611IMDAb2gOM0ZxxSY8tCSpbgj4KQx4CNmEGD5DzL+e68rZh+bP8XI7jpTZySPDEQRtxYoBSydhZtYNIEuVkJOMajNN1KuITbctjRtOyOrwh+85ieQgqTKOahJCGMCV6gZTu7K3AahiJNjRtZxFeFJNBcUd2R1OC4ZKLAwG95hUJJRU2ukbgPr2nBp2DiB6Frj2zTs/utVymbhxSmMGIQGBQY7LU0v99B6/su7D3o94HeO2933+rgS93iWJ4QEGXcWArzvQNRzgmFa7KBIF5Rgu+0yipb/9zOYHeMw3XMU0Ah4xHlxUhicLSG7A7HiTRKNfFVEnH4+qfWqxVhHEdr+PonIGfFOeNkzWKKMv7xo1TFWtMWhAIEEAatVwx+BT3w5rzbff0rSIgkQHkYA3rr+8Czw0t7NLNdT3rlzPQv7/U9lwJgSWEGjIuv4OXfCmh7evHyCIIXL8CcwuhGYlig7bItBAz4VRL0YBXpi63mAKGkmDJYQbMUwgz0yhUSgqHGYAIMBPROjcxOoh8mVGMkpzE8ArAHYTme704fx+RMPN8cjQ4DFIgehRtMJxfOcIciZaJ667vleOankR16npC5sFBOc7hnoAli0TyFnncJ/vyzJuPa5K2l6RlFm4hDAJdUBMyMkts7ECWJfEIMvGx9n7nOtenboT10bc8LZ+703z+HpmWJp/uXdfq8y2kwsgoWAtcOL31/piYcpveU2eHAPIxAfJTX5xSKOTPBxMDcZT+YWYKJgRkObNf36oZaTbZ5bOMNogSvIeZSSkeYGwSePx0LjL4beP5hAiv8A+m9g2gAKUcLFAvBHyVSUKAIMLCgYRr4n6bBRFAxHpsT675RlgpWCe7adL19KOlamygFrS1MXR4UcnoXr5MQLcJFhNKcQvCuC3rgHWjtUwA+fnxyKjv7+KK3y3cN62QSXpjO6FfJe+EaHcjjDmFGEbq1Kmg71j34oQ/0dURFGtrjU1m4K4IzwkuwjrCRzGXANvJMRFiwSKMlEBmyqhBSsmQhJyHcQMwZ0M0rrz3w7LYK8eMIW3Mz5ySQ8y/SaHmBUqiDo6+Vu91mhHJR6LAVydMkZDcoC/EGJSgKE4o2kDLt4VhYJOd+61WDWkJMQsYjzkBP6KfXBaLmAkZ8e2SV1xqFvN/6Z2XaFHJdirHbKMCLCKUwEWVVAjmka4ShMDSFFCikoCCzWBbMIRArZzBRYt2qenLtWI4ZWq5zbbtlOKwZut76PpwF4WRq2feKqtKjhMkogMNiOuyEhxQbpzDCQTacBZYSjw4eDEnyDiEo461K5y5kJN3ARAfN44fxVFHCTNYIB0yY88MxTbu+tMLRdLjNRf1Hyrmqwm49mAoealvoOOYwAUuSJhADtI6WEGQUlniP+0khu0FZGTpi+lame+MS1UUwGlV50bX/LXBc2+ovIpH8qwqgMg7HC68vReDrA6Hlhsgm2QiYcPnrS0vogVMC5jmXnt4kBUw4WJAcJ3pDbSLAZX0ymfrhhYhS9VjZTLygrGbTraknzLJV1JhTL5yYY1uY9IsXQHDViEWwWFryCYZcqMeCGdNB7WErQyWZYU2vvyovFaJKYAZxAnGMICunRxwRrB+1/gKy0qubY1HQVhTsv1DGqLe+T2zb8kS8901nYrvWrueWgvnu2yN7NnX90J6I6mUPTIkFnCIXH6ZQROBkluZLhCsC98ZV2oE8zwYTx0KUPcr6BPJvhN7sod0Z1SquHS+8EsXCyPabODnKSEK+4ZREyRXNGU9FzC5HKiEnv0Vs7a3QmlXWJ1ZVsgs9eyDqFn/khZ+mU9/zXXM2cybDZ1PiwTin0B95nwjhjNMou8rnMIXcvoVxKZAnAEuiXVsQtxcHjuyLdE9up8pQKWx5OAuKvMT0xrRSxQ5pZ4/nlB+ellMgZjmF9ZSyP7Ib0wr9CAIt+9oZ2OFsFAydSehchMJP7GPxrsIydoYVf/W0qVg0FkCXdVSx7yy+O4plI4EbFEMjk3poM0jFY0PdKD5VB+TJCNu1CCs+HMLnIOn0usYaLUNhRRwu72Tu1MFH0EngpoPzNAX/+MdLsWXVfvfUpC9arbLv60JWwv59e/i5bwhkRokMiMyRQl0Tdiltq1/72cmZqHXjKC1olJ2uJnJBq76I4FazpxcV+0X+OGZGcsffbsKtA71qKNhYlBkmTpQfNIPvVNsP7czzTdeXdffDffdh6kj2KHGWKoIkdSRrJq5Mp7s+Ib1V5ogL85PrDMKxOTGHtnt8H7ibb8emK3JLLeE2WPNj4V2SfBHNKYrHEY6Woi47/O4p+i2ksZDz1yXuxzS7B/5Qs7Ky9vZ1+kDAB8LFnoT2orEsbMp3jzKoot4YLWcR5UgWE+DhWEne8faXbuPkcJDfKyus6eDKdkWV50wOZjcGOfj7reqZkPgGUsEHwsDIQcuzXeUfrjMZODNzFA5Gjj3xQ8eSrd+D7z174Nq+oMT8D5Fsy+aJaw8dz3c/h2KmsOKKBOP2lAKryJXiK+apiRPxSzY6Kms8DKJpMYURh2JgHGG0gIxbiG6ldml6ZTvDs013cBla07F5RHZ663sTfL0l+PFAp1gWV4ZqZBoMRjReGQlZRwgfaA40LeQpw5YdmuPp6EZJpZ6BHt+CXf3Capuvq1+OVIHb5s7Eqc0ZTJxa1Te7Pg+twBwJpxxcHatlT6grrMvBbHNeepJ62in3jpfWJ6+zrSrLtbYjYLureIRY6VkVsfJpd7c/tj3PHNrh9CL0L+3QMj8XBVdjM+IA/J9gHjF4/hYYiTA8YQdrwpPdlXzTHdp+OBhNg1ImprDOwQrhaJCSPNlbkkIeLccDV21WLwiVkLtIi9rtcur5Xtm8NYf25Eg/8LgpzVRHdqC6aJeE8coWG17tKH6nRRn6rjnxZqYrwtJlMLTDmTm0n2wLlUX7NMIsiyjE/DJfwlm0hDV7b3h7hDTvN3MmY8XzyfG+RZnqvT0YanKGoTsNZtdnB9c7WIk+iB+i+IyXlOTZ5qyx8BRV3oGy8yr4ZI+ECUpywouROfT6RoHOUNmsXxCgy3LxWX5dRUTJUBV7kx0/ErRMbD/07fFsZPp2sxdtJ0tJYMhDDtdZGnEomdeeI70KpyHWMxZptHx6CV/JspJHJU+qeg0GhV9zyLg8YiM57/ferYGxXb6CgzjJCMK8n2N0+6HT6dAc1znf/mwzEt+A7QpKc6xf8NtmKYrhDnyxk6pq/7II+wEwuN5AOiBr4TZAKcSd2L7thaKAc6aTD4bebXfbXf0e6L322c/trr5Xnj1T8BX9f5HoQzeY+M7YlhroN4i4T+Ga8JoYinqvXoCUWC3Huwr9z7PDweFpXM8RTtYkx/ywtwYY8S+aC7/miELWFzMMNaXApJkLDmnTi9JJj6dB747FPC3ToHo61bHFBr4piNYMPxg5Y8f3Dgjs4A4O8m1GD1K0Rrxe9jx4dwKfRQ1aMlo81hpRniiKJ9PQCmaiOJ6OHW8QTAMv/OQ61jPSk1pnQqw8m+IZJWvE4vwTRYnITkdentKdPWH5fJ5jnns4ytiKcHXsU2l5Z7RcsLnX++AM7xSiqmh+liS9GPZ+Nro/v4fG2+6b2Ji/eXdmRL33Zz0Iz7o/QyjMnt2xzjxnnc1a/F9snjqrTZhzlHZyLMx7e95enK333qA//vJV/sC6yi80bstuSj0oXJsjxzJ9ZzoJbdftdzXNnDnFxkmdELq27zq213/XLXVYg5CC6vfBj+3icDtF+Kb9467sDmHsdeXlIBmg5RHjHuJ70P9v8J+/d433X/7+R7v5u3VwKWvi7axU0/dTGTiM+KxAXLuG8WileqDBqToAXr/16pADRBkSkRDSCUsJuckzHehN58c7gqxRew964KwLcDEbVLn6HTAknn63QQn664o8z/f6xUWbnbaVGG+QQ8vzPcFt9yGjYuUtIQ8X3W8yubZ00R/13vkv7fM37d7Z+3bvXP8RNPeZ9qxabm2vfvHC2jKqZSCkM5pOr0SBWHZvHrB3IsZDuAqZnNTo26p4cIpy6+50rw6lcQyMzb+anOnt2zeyhaVkfwxMQJ3AcHWBoFT9o/vU/6fs1fLXidcgZA/osYsQIMIJuEHxjQAki0UJXMBllMiLlREvu3SqkaX6S4fuPwgI2TifI9xZRziZi5pG0VXgXyCM2AomxUI7K4AXVfLcbUfuM/mSwjkhHFBVyCU/ATUgeMEkgQBh0ANrhHMOXyqqynuqwIiBzlY5T8g3DAwKeuCF/ox83HSpNMfFtdJ9k3wa6r3TvGBi+r49sWwrDGZD17TsQ/Xf9hMEZeC3HLevSugo4+KfLI7bSef9+wxSRBIU6wcOfVqvEkRxtJZX1nYw3uuv9853SB6vGsB2gOLVmiSge/727WOQSsnmzP/wYVYQ+eGDsjVjFsU30RIaI8SEd/f0X1+Cjx+fhxFHnEOcwMQIsiWNEngyvu01zxyvI3Yjb4omEUrvyg3DdsTIFfJqK9GMCMpTgP8LRCIq0QY0cvwAkvL2qmFgYsxTsRs+EWEd33OQNzHXdNryqAfC9ImnRH+B49XP/03ffBR+a5vqEGhrkqVFIiavrbA8ywjlMAHzO3AT8Uhd7GA/gW8oTSXIHBaqT17u2v5+PbGrjOL+EkjwwhCpYh1xFBuYcLS4I7jU9hEEjJPs+bML/9mdX15tKl1g55zA++z59njgj/aPvp6xgLLY/wX6vbO7v26VmqUXP+tHZ7q6YgrUDfEqq7bFXgGoMkds8DGMOSIYxCsY34CYJPCDDlq79ceRsziIk8aL6Nu+Y9PJj8j5KiGc+qcemqYEs0eYpv3Nnl78TwAAAP//tXl5uWUyAAA= + H4sIAAAAAAAA/9Rbe3fbtpL/n58C5dXJo7fUw0ncJr3KPYxIyzzWa0nK3Wyb5aFISMKaAhgAVOybej/7HgAkRcmkZHu7f6zPaW1Bg8HMYB4/DJC//dBZINxZhGyt2a4bXDgjO/jN9AeXge+M7enc758DjUEOjFsNLcHvwFiCDkl5J/xXRmEnIpiHCEPKOiklW8QQwe2IbNIEcgi+/Ar4GmINyB8YrQnQzYTCML4DNMSAE8CyKIKMAXiLOMKrdrutF+S3iIOutkSaFqZ8E9Kb38wRwtmtuYKYgzVJYvBC00bTYWA5br+zDWknIatcsPCGaZubGFFgpKD1Pae61xIMDAYOiKMkYxxSY6dCQlbgj1yQU8RGxKBBMp5mfH/ezkw/tv+LEVz3TZSQLDYQRtxYogSydhpuYVxHuV0LOsbDJNlZuKDbadjRtPSOrwl+c2qfAgrjMOKBFCGICF6iVTu9y3kahhJNjRtpyNe5JdBCSd2R0uCoUCLnwG95yUJZRU2uiHhIr2nzT/OJPw9ce2Sbnt1vvUrYIqAwgSGDwKDAYK+l+/0OWt/3ae9Bvw/03nm7+1YHX6oex7KYgDDlxkq47x0IM04o3JAtBNGaEnynlV7Z+uduBrtjHG4ingAKGQ8pz0dig6MNZHc4iqVTqomv4pDD1z+1Xq0J4zjcwNc/ATkryhgnGxZRlPKPH+VWbDRtSShAAGHQesXgV9ADb8673de/gphIAVSEMaC3vg88O7i0RzPb9WRUzkz/8l4/CCkAVhSmwLj4Cl7+Lae2pxcvjzB48QIsKAxvJIcl2i3bQsCAX6VAD1aRsdiqTxDKigmDJTVLIExBr1ghJhhqDMbAQEDvVMTsxHqzoBojGY3gEYIDCsvxfHd6mpMz8XxzNGomyBmdpBtMJxfOcE8i5aJ667vleOankR14nrC58FBOM3jgoDFi4SKBnncJ/vyzYuPK5J2n6SlF25BDAFdUJMyUkts7EMax/IQYeNn6PnOda9O3A3vo2p4XzNzpv38OTMsSn+5fVuXzLqfzkZWrMHft4NL3Z2pCs7yPmR0MzGYG4kdFfUahmDMTSgzMffXnM0soMTCDge36XtVRy8k2j2y8RZTgDcRcWumIcoO550/HgqPvzj2/WcCS/0BG7yAcQMrREkXC8EeFFBIoAQwsZJjO/U/T+URIMR6bE+u+1paKVhnu2nS9QyoZWtswAa0dTdUeFHJ6F23iAC2DZYiSjELwrgt64B1oHUoAPn58cik7+/iit693hetkElyYzuhXqXseGh3Iow5hRp66tTJpO9Y9+KEP9E1IRRk60FN5uCuSM8IrsAmxES9kwjayVGRYsEzCFRAVskQICVmxgJMAbiHmDOjmldceeHZbpfhxiK2FmXEyl/MvknB1gRKog6Nfq3C7TQnlAuiwNcmSOGA3KA3wFsUoDGKKtpAy7eFYkBfnfutVzbYEmASMh5yBntifXhcIzAWM6PbIKq81Cnm/9c/StSnkujRjt9aAFyFKYCxgVQw5pBuEoXA0xRQopiAXM18WLCAQK6cwVmbdbfXk2rEcM7Bc59p2i3RYcXS99X04mweTqWXfK6mKiBIuowiazdQchE0bGyUwxPN0OJtbyjw6eDAkxWtiUORbVc5dyEiyhbEO6seb+ZRZwow3CM+ZcOeHY5p2fWkFo+lwV4v6J+BcibBbD6aCh7st9jjiMAYrksQQA7QJVxCkFBZ8j8dJbrtBgQwdMX1n04NxyepiPhqVddG1/23uuLbVX4ai+JcIoHQOxwuuL0Xi6wOxyzWZTaoxZyLkry8tsQ+cErDIuIz0OitgwsGSZDjWa7CJIJf4ZDL1gwuRpaq5sl54IVnFp1tTT7hlK8eYUy+YmGNbuPSLF0BoVctFqFh48iMcOd8eC6ZMB5UPOxsqywwr+/qrilJhqhimEMcQRwiyYnrIEcH6Ue/PKct9dTMsAG0pweEXyhn11veJbVueyPe+6Uxs19qP3MIw3317ZM+mrh/YE4FeDsiUWcBj7OLDBIoMHM+SbIVwKeDBuCo7kGfpYOJYiLKTqk8g/0bozQHbvVGt1NrxgisBFka2X6fJUUVi8g0nJIyvaMZ4InJ2MVIaOf4tZBtvjTas9D6xqrJd4NkDgVv8kRd8mk59z3fN2cyZDJ8tiQejjEJ/5H0ihDNOw/QqW8AEcvsWRoVBnkAshXZtIdxBHjhyLtI9eZwqUqXw5eFsntclpteWlTJ3SD87XVN+eFpNgZhlFFZLyuHIfk7L90cIaNnXzsAOZqP50JkEzkUg4sQ+lu9KLmNnWOpXLZtKRWMJdImj8nNn/rujVDZiuEURNFK5D20GqfhYgxvFT9kBeTLDdiXDih8O4XOYdHpdY4NWgfAiDld3snbq4CPoxHDbwVmSgH/846U4smq/e2rSF62C7Pu6sJXwf98efu4bgplRMAOiciRQ14RfSt/qV/7sZExg3ShMchllp6tOXNCqLiK01ezpRal+Xj+OuZE88bfreOtALxsKNhYww8SxioN68j20/dDPPN90fYm7H567m6Uj6UnhLAWCpHQkrReuKKf7MSGjVdaIC/OT6wyCsTkxh7Z7/By4X2/HpitqS6Xg1njzqfQuRb4IFxRF4xCHK4HLmr97yv7m1ljK+ZuC96mdPSB/uLMSWXuHe/rAwA3p4sBCB9lYApviu5MKqqw3RqtZSDmSYAI8HCvEO97+0m0cNyf5A1hhTQdXtitQnjNprG4McvD3W9UzIdENpEIPhIGRgZZnuyo+XGcycGbmKBiMHHviB44lW7+N33v2wLV9IYn5H6LYFs0T1x46nu9+DsRM4cWlCMbtYwBWXivFr4gnJo7FX7LRUXpjM4mmRRSGHIqBcYjREjJuIbqz2qXpFe0MzzbdwWVgTcfmEdvpre919NWW4MeGTrEEV4ZqZBoMhjRaGzHZhAg3NAfqFvKUY8sOzfFydKOsUq1Ap49gV7+wyuHr6pcjKHDX3Jk4lTmDiVNBfbPr88CamyMRlIOrY1j2EbjCuhzMtudFJKlPe3DvOLR+9Do7VFmstRsBu1PFCWFlZJXCyk/7p/2x7Xnm0A6mF4F/aQeW+TkHXLXNiAb6P8EiZPD8LTBi4XjCDzaEx/sr+aY7tP1gMJrOC5uYwjsHa4TDQUKy+GBJCnm4Gg9cdVi9IFRS7jPNsdvl1PO9onlrDu3JkX7gcVeaqY7sQHXRLgnjpS/WfLW38XstysB3zYk3M12Rli7nQzuYmUP7yb5QerRPQ8zSkELML7MVnIUrWPH3mm+PiOb9Zs5krni+ON63MFW9twdDdcEwdKfz2fVZ43qNSPRB/hDgM1pRkqXbs1rgKVBeA+y8mn+yR8IFpTjBxcgcen0jZ2eoatbPBdAlXHxWXJcZUSpU5t54L46ELBPbD3x7PBuZvl0fRbvJ0hIY8oDDTZqEHErltedYr+RpiPWMZRKung7hS1uW9ijtSVWvwaDwawYZl1dsJOP93rsNMHbLl3QQxylBmPczjG4/dDodmuGq5rs/24xEN2C3gto51s/1bbMERXCPPj9Jldi/AGE/AAY3W0gHZCPCBqgNcSe2b3uBAHDOdPLB0Lvtbrur3wO91z77ud3VD+DZMw1fyv8XmT5w5xPfGdtyB/o1Ju5TuCG8YoYc71UBSMHVcryrwP88a04OT9N6gXC8IRnmzdE6x4h/0Vz4NUMUsr6YYagpOSfNXHJI674ogvR4GfTuWMSTogyqT48NbHGAr0uiFcefj5yx43sNBms8wUG+q+jzBG0Qr8KeB989Qs8cgxaK5h8rjShPgOLJNLDmMwGOp2PHG8yncy/45DrWM8qTWmdCrCyd4hklG8Si7BNFsahOR758VHdWXTg86jTZJF+2yDDPPBymbE24uhcq3WBvtJCovhn84JKvUeq6dvhZHPci2PvZ6P78Hhpvu28iY/Hm3ZkR9t6f9SA86/4MoYgLdsc6i4x1thvx//x01Vlvg4yjpJNh4f+7C/n88r33Bv3xl6/yB9ZVAaJRW7Zbqlnj2hw5luk700lgu26/q2nmzMlPVuoK0bV917G9/rtusckVCmmofh/82M5vvxOEb9o/7tuuiWOvK18PyQwu7yAPGN+D/n+D//y9a7z/8vc/2vW/W41LWRNvb6XKfj9VgWbGZznjyjuNk1C2oQOqWgRev/WqKQDCFIlUCemEJYTcZKkO9LoL5j1DVqS9Bz1w1gU4nw3KYv4OGJJPv1uzCfrrUjzP9/r5S5y9vpYYr7FDy/M9oW33oaJi5Z0gDxc97EK5tgzRH/Xe+S/t8zft3tn7du9c/xHUN6IOvFqefa9+8YLKMqqnIKwzmk6vBIIs2jsP1HskxyZeuU0e1QncbfHgMZtbDad7dWuNI2Bs/1UXTG/fvpE9LmX7Y2SC6hEKly8Miq0/eZD9f6pepcA98p2EbBKdeikBQhyDGxTdCEKyXBbEOV1KiXx5GfKijac6XaoB1fRAQlDIzvoC4c4mxPFCgB4lV85/iTBiaxjnC+2tAF6UxXO/X3mo5EsKF4RwQBXSi38CakDogkkMAcKgBzYIZxy+VFIVD1mBEQGdrTMek28YGBT0wAv9GfW47tVphvN3p4cu+TTWB9d984np+/bEsq1gPhu6pmU3AcTdz3xeJH7LcfsKY4cpF/9J9NyOO+/fp5AiEqNIb7gVar2KEcXhRr5p2+N4r78+uAAiWbSuIdsjitYbEoPu+du3pyjVJpsz/8OHWS7khw/K14xZGN2EK2iMEBPR3dN/fQk+fnweRxxyDnEMY2OermgYw0fz270DzfAmZDfyKWkcouSuOFHsRoxMMS/PGvWMoLwm+L9gJLISrWEjxxuYFM9bDQMTY5GI4/IjGVb5PYd5nXJ11zEnIxAmT7xG+gsCr/pAwPTNk/Q731S3RDuXLDwSMfmuhWVpSiiHMVjcgZuQh+rlB/sJfENJIkkWMN/6+OW+7x/iif3NyB84gRgvDVEqNiFHkYEJR8s7govdPsKAcZI+f3YeP/vzi7dPRQjsXSR4nz3fHg/80eHd2DMWUB77v2B/cLn3161S8fT8z+rdmq7eoAL1hLysqm1xVgAK5oCIYAwjjggG0RpGNyAiMfygg9Y+/jhyWQdxXPtSfdeYrLsaEjVfFYTH/lsQTVOGORBM0/5mTy/+JwAA//9dgNZDhjIAAA== - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+Docker/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+Docker/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index d8646a4b9e5..ffaf398c9c2 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line313.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line313.sh rename to pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 7fc83916bd7..e8a12fd2b8a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line227.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line229.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line227.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line229.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line311.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line321.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line311.sh rename to pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line321.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index a06afa3c461..caa5d178d42 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line319.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line319.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S115/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line313.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line313.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S117/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line313.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line313.sh rename to pkg/agent/testdata/AKSUbuntu1604+K8S118/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index bf237f8ce9a..9897ed9bce6 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S115/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index a06afa3c461..caa5d178d42 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line213.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line213.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line220.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line220.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line311.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S117/line311.sh rename to pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index d0ea311fbbb..e7dca3af785 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line214.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line216.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line214.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line216.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line221.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line223.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line221.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line223.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line311.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line315.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+K8S118/line311.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line315.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 766c888ca9e..54e15e4e8a5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line214.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line216.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line214.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line216.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line221.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line223.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line221.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line223.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line315.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line315.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index d0ea311fbbb..e7dca3af785 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line126.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line126.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line133.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line133.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line140.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line140.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line147.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line147.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line154.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line154.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line161.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line161.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line168.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line168.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line214.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line216.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line214.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line216.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line221.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line223.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line221.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line223.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line312.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line315.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line312.sh rename to pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line315.sh diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index a24ef4a9199..fd7aaad241e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 9f42928d1e7..dc061002fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line227.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line229.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line227.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line229.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line318.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line320.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line318.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line320.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 1edb35dc18e..a9099a1cb5a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index e9b866d4d5e..45e6ccb0cff 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index dc951613e87..dfcc17853c1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 9f42928d1e7..dc061002fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line227.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line229.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line227.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line229.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line318.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line320.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line318.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line320.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 9f42928d1e7..dc061002fc1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line227.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line229.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line227.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line229.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line318.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line320.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line318.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line320.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9Q7a3Pbtpbf+StQXk0evaUeTuI26VXuMCItc6zX8uFuts1yKBKSsKYABgAV+6be374DgKQomZJlb/fDaiaRCB4cnPc5OID/9kNnjnBnHrGVZrtueOGM7PA30x9chr4ztqeB3z8HGoMcGLcaWoDfgbEAHZLxTvSvnMJOTDCPEIaUdTJKNoghgtsxWWcp5BB8+RXwFcQakB8YrwjQzZTCKLkDNMKAE8DyOIaMAXiLOMLLdrutl+C3iIOutkCaFmV8HdGb38wRwvmtuYSYgxVJE/BC00bTYWg5br+ziWgnJcuCsOiGaeubBFFgZKD1vYC611IMDAb2gOM0ZxxSY8tCSpbgj4KQx4CNmEGD5DzL+e68rZh+bP8XI7jpTZySPDEQRtxYoBSydhZtYNIEuVkJOMajNN1KuITbctjRtOyOrwh+85ieQgqTKOahJCGMCV6gZTu7K3AahiJNjRtZxFeFJNBcUd2R1OC4ZKLAwG95hUJJRU2ukbgPr2nBp2DiB6Frj2zTs/utVymbhxSmMGIQGBQY7LU0v99B6/su7D3o94HeO2933+rgS93iWJ4QEGXcWArzvQNRzgmFa7KBIF5Rgu+0yipb/9zOYHeMw3XMU0Ah4xHlxUhicLSG7A7HiTRKNfFVEnH4+qfWqxVhHEdr+PonIGfFOeNkzWKKMv7xo1TFWtMWhAIEEAatVwx+BT3w5rzbff0rSIgkQHkYA3rr+8Czw0t7NLNdT3rlzPQv7/U9lwJgSWEGjIuv4OXfCmh7evHyCIIXL8CcwuhGYlig7bItBAz4VRL0YBXpi63mAKGkmDJYQbMUwgz0yhUSgqHGYAIMBPROjcxOoh8mVGMkpzE8ArAHYTme704fx+RMPN8cjQ4DFIgehRtMJxfOcIciZaJ667vleOankR16npC5sFBOc7hnoAli0TyFnncJ/vyzJuPa5K2l6RlFm4hDAJdUBMyMkts7ECWJfEIMvGx9n7nOtenboT10bc8LZ+703z+HpmWJp/uXdfq8y2kwsgoWAtcOL31/piYcpveU2eHAPIxAfJTX5xSKOTPBxMDcZT+YWYKJgRkObNf36oZaTbZ5bOMNogSvIeZSSkeYGwSePx0LjL4beP5hAiv8A+m9g2gAKUcLFAvBHyVSUKAIMLCgYRr4n6bBRFAxHpsT675RlgpWCe7adL19KOlamygFrS1MXR4UcnoXr5MQLcJFhNKcQvCuC3rgHWjtUwA+fnxyKjv7+KK3y3cN62QSXpjO6FfJe+EaHcjjDmFGEbq1Kmg71j34oQ/0dURFGtrjU1m4K4IzwkuwjrCRzGXANvJMRFiwSKMlEBmyqhBSsmQhJyHcQMwZ0M0rrz3w7LYK8eMIW3Mz5ySQ8y/SaHmBUqiDo6+Vu91mhHJR6LAVydMkZDcoC/EGJSgKE4o2kDLt4VhYJOd+61WDWkJMQsYjzkBP6KfXBaLmAkZ8e2SV1xqFvN/6Z2XaFHJdirHbKMCLCKUwEWVVAjmka4ShMDSFFCikoCCzWBbMIRArZzBRYt2qenLtWI4ZWq5zbbtlOKwZut76PpwF4WRq2feKqtKjhMkogMNiOuyEhxQbpzDCQTacBZYSjw4eDEnyDiEo461K5y5kJN3ARAfN44fxVFHCTNYIB0yY88MxTbu+tMLRdLjNRf1Hyrmqwm49mAoealvoOOYwAUuSJhADtI6WEGQUlniP+0khu0FZGTpi+lame+MS1UUwGlV50bX/LXBc2+ovIpH8qwqgMg7HC68vReDrA6Hlhsgm2QiYcPnrS0vogVMC5jmXnt4kBUw4WJAcJ3pDbSLAZX0ymfrhhYhS9VjZTLygrGbTraknzLJV1JhTL5yYY1uY9IsXQHDViEWwWFryCYZcqMeCGdNB7WErQyWZYU2vvyovFaJKYAZxAnGMICunRxwRrB+1/gKy0qubY1HQVhTsv1DGqLe+T2zb8kS8901nYrvWrueWgvnu2yN7NnX90J6I6mUPTIkFnCIXH6ZQROBkluZLhCsC98ZV2oE8zwYTx0KUPcr6BPJvhN7sod0Z1SquHS+8EsXCyPabODnKSEK+4ZREyRXNGU9FzC5HKiEnv0Vs7a3QmlXWJ1ZVsgs9eyDqFn/khZ+mU9/zXXM2cybDZ1PiwTin0B95nwjhjNMou8rnMIXcvoVxKZAnAEuiXVsQtxcHjuyLdE9up8pQKWx5OAuKvMT0xrRSxQ5pZ4/nlB+ellMgZjmF9ZSyP7Ib0wr9CAIt+9oZ2OFsFAydSehchMJP7GPxrsIydoYVf/W0qVg0FkCXdVSx7yy+O4plI4EbFEMjk3poM0jFY0PdKD5VB+TJCNu1CCs+HMLnIOn0usYaLUNhRRwu72Tu1MFH0EngpoPzNAX/+MdLsWXVfvfUpC9arbLv60JWwv59e/i5bwhkRokMiMyRQl0Tdiltq1/72cmZqHXjKC1olJ2uJnJBq76I4FazpxcV+0X+OGZGcsffbsKtA71qKNhYlBkmTpQfNIPvVNsP7czzTdeXdffDffdh6kj2KHGWKoIkdSRrJq5Mp7s+Ib1V5ogL85PrDMKxOTGHtnt8H7ibb8emK3JLLeE2WPNj4V2SfBHNKYrHEY6Woi47/O4p+i2ksZDz1yXuxzS7B/5Qs7Ky9vZ1+kDAB8LFnoT2orEsbMp3jzKoot4YLWcR5UgWE+DhWEne8faXbuPkcJDfKyus6eDKdkWV50wOZjcGOfj7reqZkPgGUsEHwsDIQcuzXeUfrjMZODNzFA5Gjj3xQ8eSrd+D7z174Nq+oMT8D5Fsy+aJaw8dz3c/h2KmsOKKBOP2lAKryJXiK+apiRPxSzY6Kms8DKJpMYURh2JgHGG0gIxbiG6ldml6ZTvDs013cBla07F5RHZ663sTfL0l+PFAp1gWV4ZqZBoMRjReGQlZRwgfaA40LeQpw5YdmuPp6EZJpZ6BHt+CXf3Capuvq1+OVIHb5s7Eqc0ZTJxa1Te7Pg+twBwJpxxcHatlT6grrMvBbHNeepJ62in3jpfWJ6+zrSrLtbYjYLureIRY6VkVsfJpd7c/tj3PHNrh9CL0L+3QMj8XBVdjM+IA/J9gHjF4/hYYiTA8YQdrwpPdlXzTHdp+OBhNg1ImprDOwQrhaJCSPNlbkkIeLccDV21WLwiVkLtIi9rtcur5Xtm8NYf25Eg/8LgpzVRHdqC6aJeE8coWG17tKH6nRRn6rjnxZqYrwtJlMLTDmTm0n2wLlUX7NMIsiyjE/DJfwlm0hDV7b3h7hDTvN3MmY8XzyfG+RZnqvT0YanKGoTsNZtdnB9c7WIk+iB+i+IyXlOTZ5qyx8BRV3oGy8yr4ZI+ECUpywouROfT6RoHOUNmsXxCgy3LxWX5dRUTJUBV7kx0/ErRMbD/07fFsZPp2sxdtJ0tJYMhDDtdZGnEomdeeI70KpyHWMxZptHx6CV/JspJHJU+qeg0GhV9zyLg8YiM57/ferYGxXb6CgzjJCMK8n2N0+6HT6dAc1znf/mwzEt+A7QpKc6xf8NtmKYrhDnyxk6pq/7II+wEwuN5AOiBr4TZAKcSd2L7thaKAc6aTD4bebXfbXf0e6L322c/trr5Xnj1T8BX9f5HoQzeY+M7YlhroN4i4T+Ga8JoYinqvXoCUWC3Huwr9z7PDweFpXM8RTtYkx/ywtwYY8S+aC7/miELWFzMMNaXApJkLDmnTi9JJj6dB747FPC3ToHo61bHFBr4piNYMPxg5Y8f3Dgjs4A4O8m1GD1K0Rrxe9jx4dwKfRQ1aMlo81hpRniiKJ9PQCmaiOJ6OHW8QTAMv/OQ61jPSk1pnQqw8m+IZJWvE4vwTRYnITkdentKdPWH5fJ5jnns4ytiKcHXsU2l5Z7RcsLnX++AM7xSiqmh+liS9GPZ+Nro/v4fG2+6b2Ji/eXdmRL33Zz0Iz7o/QyjMnt2xzjxnnc1a/F9snjqrTZhzlHZyLMx7e95enK333qA//vJV/sC6yi80bstuSj0oXJsjxzJ9ZzoJbdftdzXNnDnFxkmdELq27zq213/XLXVYg5CC6vfBj+3icDtF+Kb9467sDmHsdeXlIBmg5RHjHuJ70P9v8J+/d433X/7+R7v5u3VwKWvi7axU0/dTGTiM+KxAXLuG8WileqDBqToAXr/16pADRBkSkRDSCUsJuckzHehN58c7gqxRew964KwLcDEbVLn6HTAknn63QQn664o8z/f6xUWbnbaVGG+QQ8vzPcFt9yGjYuUtIQ8X3W8yubZ00R/13vkv7fM37d7Z+3bvXP8RNPeZ9qxabm2vfvHC2jKqZSCkM5pOr0SBWHZvHrB3IsZDuAqZnNTo26p4cIpy6+50rw6lcQyMzb+anOnt2zeyhaVkfwxMQJ3AcHWBoFT9o/vU/6fs1fLXidcgZA/osYsQIMIJuEHxjQAki0UJXMBllMiLlREvu3SqkaX6S4fuPwgI2TifI9xZRziZi5pG0VXgXyCM2AomxUI7K4AXVfLcbUfuM/mSwjkhHFBVyCU/ATUgeMEkgQBh0ANrhHMOXyqqynuqwIiBzlY5T8g3DAwKeuCF/ox83HSpNMfFtdJ9k3wa6r3TvGBi+r49sWwrDGZD17TsQ/Xf9hMEZeC3HLevSugo4+KfLI7bSef9+wxSRBIU6wcOfVqvEkRxtJZX1nYw3uuv9853SB6vGsB2gOLVmiSge/727WOQSsnmzP/wYVYQ+eGDsjVjFsU30RIaI8SEd/f0X1+Cjx+fhxFHnEOcwMQIsiWNEngyvu01zxyvI3Yjb4omEUrvyg3DdsTIFfJqK9GMCMpTgP8LRCIq0QY0cvwAkvL2qmFgYsxTsRs+EWEd33OQNzHXdNryqAfC9ImnRH+B49XP/03ffBR+a5vqEGhrkqVFIiavrbA8ywjlMAHzO3AT8Uhd7GA/gW8oTSXIHBaqT17u2v5+PbGrjOL+EkjwwhCpYh1xFBuYcLS4I7jU9hEEjJPs+bML/9mdX15tKl1g55zA++z59njgj/aPvp6xgLLY/wX6vbO7v26VmqUXP+tHZ7q6YgrUDfEqq7bFXgGoMkds8DGMOSIYxCsY34CYJPCDDlq79ceRsziIk8aL6Nu+Y9PJj8j5KiGc+qcemqYEs0eYpv3Nnl78TwAAAP//tXl5uWUyAAA= + H4sIAAAAAAAA/9Rbe3fbtpL/n58C5dXJo7fUw0ncJr3KPYxIyzzWa0nK3Wyb5aFISMKaAhgAVOybej/7HgAkRcmkZHu7f6zPaW1Bg8HMYB4/DJC//dBZINxZhGyt2a4bXDgjO/jN9AeXge+M7enc758DjUEOjFsNLcHvwFiCDkl5J/xXRmEnIpiHCEPKOiklW8QQwe2IbNIEcgi+/Ar4GmINyB8YrQnQzYTCML4DNMSAE8CyKIKMAXiLOMKrdrutF+S3iIOutkSaFqZ8E9Kb38wRwtmtuYKYgzVJYvBC00bTYWA5br+zDWknIatcsPCGaZubGFFgpKD1Pae61xIMDAYOiKMkYxxSY6dCQlbgj1yQU8RGxKBBMp5mfH/ezkw/tv+LEVz3TZSQLDYQRtxYogSydhpuYVxHuV0LOsbDJNlZuKDbadjRtPSOrwl+c2qfAgrjMOKBFCGICF6iVTu9y3kahhJNjRtpyNe5JdBCSd2R0uCoUCLnwG95yUJZRU2uiHhIr2nzT/OJPw9ce2Sbnt1vvUrYIqAwgSGDwKDAYK+l+/0OWt/3ae9Bvw/03nm7+1YHX6oex7KYgDDlxkq47x0IM04o3JAtBNGaEnynlV7Z+uduBrtjHG4ingAKGQ8pz0dig6MNZHc4iqVTqomv4pDD1z+1Xq0J4zjcwNc/ATkryhgnGxZRlPKPH+VWbDRtSShAAGHQesXgV9ADb8673de/gphIAVSEMaC3vg88O7i0RzPb9WRUzkz/8l4/CCkAVhSmwLj4Cl7+Lae2pxcvjzB48QIsKAxvJIcl2i3bQsCAX6VAD1aRsdiqTxDKigmDJTVLIExBr1ghJhhqDMbAQEDvVMTsxHqzoBojGY3gEYIDCsvxfHd6mpMz8XxzNGomyBmdpBtMJxfOcE8i5aJ667vleOankR14nrC58FBOM3jgoDFi4SKBnncJ/vyzYuPK5J2n6SlF25BDAFdUJMyUkts7EMax/IQYeNn6PnOda9O3A3vo2p4XzNzpv38OTMsSn+5fVuXzLqfzkZWrMHft4NL3Z2pCs7yPmR0MzGYG4kdFfUahmDMTSgzMffXnM0soMTCDge36XtVRy8k2j2y8RZTgDcRcWumIcoO550/HgqPvzj2/WcCS/0BG7yAcQMrREkXC8EeFFBIoAQwsZJjO/U/T+URIMR6bE+u+1paKVhnu2nS9QyoZWtswAa0dTdUeFHJ6F23iAC2DZYiSjELwrgt64B1oHUoAPn58cik7+/iit693hetkElyYzuhXqXseGh3Iow5hRp66tTJpO9Y9+KEP9E1IRRk60FN5uCuSM8IrsAmxES9kwjayVGRYsEzCFRAVskQICVmxgJMAbiHmDOjmldceeHZbpfhxiK2FmXEyl/MvknB1gRKog6Nfq3C7TQnlAuiwNcmSOGA3KA3wFsUoDGKKtpAy7eFYkBfnfutVzbYEmASMh5yBntifXhcIzAWM6PbIKq81Cnm/9c/StSnkujRjt9aAFyFKYCxgVQw5pBuEoXA0xRQopiAXM18WLCAQK6cwVmbdbfXk2rEcM7Bc59p2i3RYcXS99X04mweTqWXfK6mKiBIuowiazdQchE0bGyUwxPN0OJtbyjw6eDAkxWtiUORbVc5dyEiyhbEO6seb+ZRZwow3CM+ZcOeHY5p2fWkFo+lwV4v6J+BcibBbD6aCh7st9jjiMAYrksQQA7QJVxCkFBZ8j8dJbrtBgQwdMX1n04NxyepiPhqVddG1/23uuLbVX4ai+JcIoHQOxwuuL0Xi6wOxyzWZTaoxZyLkry8tsQ+cErDIuIz0OitgwsGSZDjWa7CJIJf4ZDL1gwuRpaq5sl54IVnFp1tTT7hlK8eYUy+YmGNbuPSLF0BoVctFqFh48iMcOd8eC6ZMB5UPOxsqywwr+/qrilJhqhimEMcQRwiyYnrIEcH6Ue/PKct9dTMsAG0pweEXyhn11veJbVueyPe+6Uxs19qP3MIw3317ZM+mrh/YE4FeDsiUWcBj7OLDBIoMHM+SbIVwKeDBuCo7kGfpYOJYiLKTqk8g/0bozQHbvVGt1NrxgisBFka2X6fJUUVi8g0nJIyvaMZ4InJ2MVIaOf4tZBtvjTas9D6xqrJd4NkDgVv8kRd8mk59z3fN2cyZDJ8tiQejjEJ/5H0ihDNOw/QqW8AEcvsWRoVBnkAshXZtIdxBHjhyLtI9eZwqUqXw5eFsntclpteWlTJ3SD87XVN+eFpNgZhlFFZLyuHIfk7L90cIaNnXzsAOZqP50JkEzkUg4sQ+lu9KLmNnWOpXLZtKRWMJdImj8nNn/rujVDZiuEURNFK5D20GqfhYgxvFT9kBeTLDdiXDih8O4XOYdHpdY4NWgfAiDld3snbq4CPoxHDbwVmSgH/846U4smq/e2rSF62C7Pu6sJXwf98efu4bgplRMAOiciRQ14RfSt/qV/7sZExg3ShMchllp6tOXNCqLiK01ezpRal+Xj+OuZE88bfreOtALxsKNhYww8SxioN68j20/dDPPN90fYm7H567m6Uj6UnhLAWCpHQkrReuKKf7MSGjVdaIC/OT6wyCsTkxh7Z7/By4X2/HpitqS6Xg1njzqfQuRb4IFxRF4xCHK4HLmr97yv7m1ljK+ZuC96mdPSB/uLMSWXuHe/rAwA3p4sBCB9lYApviu5MKqqw3RqtZSDmSYAI8HCvEO97+0m0cNyf5A1hhTQdXtitQnjNprG4McvD3W9UzIdENpEIPhIGRgZZnuyo+XGcycGbmKBiMHHviB44lW7+N33v2wLV9IYn5H6LYFs0T1x46nu9+DsRM4cWlCMbtYwBWXivFr4gnJo7FX7LRUXpjM4mmRRSGHIqBcYjREjJuIbqz2qXpFe0MzzbdwWVgTcfmEdvpre919NWW4MeGTrEEV4ZqZBoMhjRaGzHZhAg3NAfqFvKUY8sOzfFydKOsUq1Ap49gV7+wyuHr6pcjKHDX3Jk4lTmDiVNBfbPr88CamyMRlIOrY1j2EbjCuhzMtudFJKlPe3DvOLR+9Do7VFmstRsBu1PFCWFlZJXCyk/7p/2x7Xnm0A6mF4F/aQeW+TkHXLXNiAb6P8EiZPD8LTBi4XjCDzaEx/sr+aY7tP1gMJrOC5uYwjsHa4TDQUKy+GBJCnm4Gg9cdVi9IFRS7jPNsdvl1PO9onlrDu3JkX7gcVeaqY7sQHXRLgnjpS/WfLW38XstysB3zYk3M12Rli7nQzuYmUP7yb5QerRPQ8zSkELML7MVnIUrWPH3mm+PiOb9Zs5krni+ON63MFW9twdDdcEwdKfz2fVZ43qNSPRB/hDgM1pRkqXbs1rgKVBeA+y8mn+yR8IFpTjBxcgcen0jZ2eoatbPBdAlXHxWXJcZUSpU5t54L46ELBPbD3x7PBuZvl0fRbvJ0hIY8oDDTZqEHErltedYr+RpiPWMZRKung7hS1uW9ijtSVWvwaDwawYZl1dsJOP93rsNMHbLl3QQxylBmPczjG4/dDodmuGq5rs/24xEN2C3gto51s/1bbMERXCPPj9Jldi/AGE/AAY3W0gHZCPCBqgNcSe2b3uBAHDOdPLB0Lvtbrur3wO91z77ud3VD+DZMw1fyv8XmT5w5xPfGdtyB/o1Ju5TuCG8YoYc71UBSMHVcryrwP88a04OT9N6gXC8IRnmzdE6x4h/0Vz4NUMUsr6YYagpOSfNXHJI674ogvR4GfTuWMSTogyqT48NbHGAr0uiFcefj5yx43sNBms8wUG+q+jzBG0Qr8KeB989Qs8cgxaK5h8rjShPgOLJNLDmMwGOp2PHG8yncy/45DrWM8qTWmdCrCyd4hklG8Si7BNFsahOR758VHdWXTg86jTZJF+2yDDPPBymbE24uhcq3WBvtJCovhn84JKvUeq6dvhZHPci2PvZ6P78Hhpvu28iY/Hm3ZkR9t6f9SA86/4MoYgLdsc6i4x1thvx//x01Vlvg4yjpJNh4f+7C/n88r33Bv3xl6/yB9ZVAaJRW7Zbqlnj2hw5luk700lgu26/q2nmzMlPVuoK0bV917G9/rtusckVCmmofh/82M5vvxOEb9o/7tuuiWOvK18PyQwu7yAPGN+D/n+D//y9a7z/8vc/2vW/W41LWRNvb6XKfj9VgWbGZznjyjuNk1C2oQOqWgRev/WqKQDCFIlUCemEJYTcZKkO9LoL5j1DVqS9Bz1w1gU4nw3KYv4OGJJPv1uzCfrrUjzP9/r5S5y9vpYYr7FDy/M9oW33oaJi5Z0gDxc97EK5tgzRH/Xe+S/t8zft3tn7du9c/xHUN6IOvFqefa9+8YLKMqqnIKwzmk6vBIIs2jsP1HskxyZeuU0e1QncbfHgMZtbDad7dWuNI2Bs/1UXTG/fvpE9LmX7Y2SC6hEKly8Miq0/eZD9f6pepcA98p2EbBKdeikBQhyDGxTdCEKyXBbEOV1KiXx5GfKijac6XaoB1fRAQlDIzvoC4c4mxPFCgB4lV85/iTBiaxjnC+2tAF6UxXO/X3mo5EsKF4RwQBXSi38CakDogkkMAcKgBzYIZxy+VFIVD1mBEQGdrTMek28YGBT0wAv9GfW47tVphvN3p4cu+TTWB9d984np+/bEsq1gPhu6pmU3AcTdz3xeJH7LcfsKY4cpF/9J9NyOO+/fp5AiEqNIb7gVar2KEcXhRr5p2+N4r78+uAAiWbSuIdsjitYbEoPu+du3pyjVJpsz/8OHWS7khw/K14xZGN2EK2iMEBPR3dN/fQk+fnweRxxyDnEMY2OermgYw0fz270DzfAmZDfyKWkcouSuOFHsRoxMMS/PGvWMoLwm+L9gJLISrWEjxxuYFM9bDQMTY5GI4/IjGVb5PYd5nXJ11zEnIxAmT7xG+gsCr/pAwPTNk/Q731S3RDuXLDwSMfmuhWVpSiiHMVjcgZuQh+rlB/sJfENJIkkWMN/6+OW+7x/iif3NyB84gRgvDVEqNiFHkYEJR8s7govdPsKAcZI+f3YeP/vzi7dPRQjsXSR4nz3fHg/80eHd2DMWUB77v2B/cLn3161S8fT8z+rdmq7eoAL1hLysqm1xVgAK5oCIYAwjjggG0RpGNyAiMfygg9Y+/jhyWQdxXPtSfdeYrLsaEjVfFYTH/lsQTVOGORBM0/5mTy/+JwAA//9dgNZDhjIAAA== - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 683f4fc9810..d3dd552cec3 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line227.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line229.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line227.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line229.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line319.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line321.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line319.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line321.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9Q7a3Pbtpbf+StQXk0evaUeTuI26VXuMCItc6zX8uFuts1yKBKSsKYABgAV+6be374DgKQomZJlb/fDaiaRCB4cnPc5OID/9kNnjnBnHrGVZrtueOGM7PA30x9chr4ztqeB3z8HGoMcGLcaWoDfgbEAHZLxTvSvnMJOTDCPEIaUdTJKNoghgtsxWWcp5BB8+RXwFcQakB8YrwjQzZTCKLkDNMKAE8DyOIaMAXiLOMLLdrutl+C3iIOutkCaFmV8HdGb38wRwvmtuYSYgxVJE/BC00bTYWg5br+ziWgnJcuCsOiGaeubBFFgZKD1vYC611IMDAb2gOM0ZxxSY8tCSpbgj4KQx4CNmEGD5DzL+e68rZh+bP8XI7jpTZySPDEQRtxYoBSydhZtYNIEuVkJOMajNN1KuITbctjRtOyOrwh+85ieQgqTKOahJCGMCV6gZTu7K3AahiJNjRtZxFeFJNBcUd2R1OC4ZKLAwG95hUJJRU2ukbgPr2nBp2DiB6Frj2zTs/utVymbhxSmMGIQGBQY7LU0v99B6/su7D3o94HeO2933+rgS93iWJ4QEGXcWArzvQNRzgmFa7KBIF5Rgu+0yipb/9zOYHeMw3XMU0Ah4xHlxUhicLSG7A7HiTRKNfFVEnH4+qfWqxVhHEdr+PonIGfFOeNkzWKKMv7xo1TFWtMWhAIEEAatVwx+BT3w5rzbff0rSIgkQHkYA3rr+8Czw0t7NLNdT3rlzPQv7/U9lwJgSWEGjIuv4OXfCmh7evHyCIIXL8CcwuhGYlig7bItBAz4VRL0YBXpi63mAKGkmDJYQbMUwgz0yhUSgqHGYAIMBPROjcxOoh8mVGMkpzE8ArAHYTme704fx+RMPN8cjQ4DFIgehRtMJxfOcIciZaJ667vleOankR16npC5sFBOc7hnoAli0TyFnncJ/vyzJuPa5K2l6RlFm4hDAJdUBMyMkts7ECWJfEIMvGx9n7nOtenboT10bc8LZ+703z+HpmWJp/uXdfq8y2kwsgoWAtcOL31/piYcpveU2eHAPIxAfJTX5xSKOTPBxMDcZT+YWYKJgRkObNf36oZaTbZ5bOMNogSvIeZSSkeYGwSePx0LjL4beP5hAiv8A+m9g2gAKUcLFAvBHyVSUKAIMLCgYRr4n6bBRFAxHpsT675RlgpWCe7adL19KOlamygFrS1MXR4UcnoXr5MQLcJFhNKcQvCuC3rgHWjtUwA+fnxyKjv7+KK3y3cN62QSXpjO6FfJe+EaHcjjDmFGEbq1Kmg71j34oQ/0dURFGtrjU1m4K4IzwkuwjrCRzGXANvJMRFiwSKMlEBmyqhBSsmQhJyHcQMwZ0M0rrz3w7LYK8eMIW3Mz5ySQ8y/SaHmBUqiDo6+Vu91mhHJR6LAVydMkZDcoC/EGJSgKE4o2kDLt4VhYJOd+61WDWkJMQsYjzkBP6KfXBaLmAkZ8e2SV1xqFvN/6Z2XaFHJdirHbKMCLCKUwEWVVAjmka4ShMDSFFCikoCCzWBbMIRArZzBRYt2qenLtWI4ZWq5zbbtlOKwZut76PpwF4WRq2feKqtKjhMkogMNiOuyEhxQbpzDCQTacBZYSjw4eDEnyDiEo461K5y5kJN3ARAfN44fxVFHCTNYIB0yY88MxTbu+tMLRdLjNRf1Hyrmqwm49mAoealvoOOYwAUuSJhADtI6WEGQUlniP+0khu0FZGTpi+lame+MS1UUwGlV50bX/LXBc2+ovIpH8qwqgMg7HC68vReDrA6Hlhsgm2QiYcPnrS0vogVMC5jmXnt4kBUw4WJAcJ3pDbSLAZX0ymfrhhYhS9VjZTLygrGbTraknzLJV1JhTL5yYY1uY9IsXQHDViEWwWFryCYZcqMeCGdNB7WErQyWZYU2vvyovFaJKYAZxAnGMICunRxwRrB+1/gKy0qubY1HQVhTsv1DGqLe+T2zb8kS8901nYrvWrueWgvnu2yN7NnX90J6I6mUPTIkFnCIXH6ZQROBkluZLhCsC98ZV2oE8zwYTx0KUPcr6BPJvhN7sod0Z1SquHS+8EsXCyPabODnKSEK+4ZREyRXNGU9FzC5HKiEnv0Vs7a3QmlXWJ1ZVsgs9eyDqFn/khZ+mU9/zXXM2cybDZ1PiwTin0B95nwjhjNMou8rnMIXcvoVxKZAnAEuiXVsQtxcHjuyLdE9up8pQKWx5OAuKvMT0xrRSxQ5pZ4/nlB+ellMgZjmF9ZSyP7Ib0wr9CAIt+9oZ2OFsFAydSehchMJP7GPxrsIydoYVf/W0qVg0FkCXdVSx7yy+O4plI4EbFEMjk3poM0jFY0PdKD5VB+TJCNu1CCs+HMLnIOn0usYaLUNhRRwu72Tu1MFH0EngpoPzNAX/+MdLsWXVfvfUpC9arbLv60JWwv59e/i5bwhkRokMiMyRQl0Tdiltq1/72cmZqHXjKC1olJ2uJnJBq76I4FazpxcV+0X+OGZGcsffbsKtA71qKNhYlBkmTpQfNIPvVNsP7czzTdeXdffDffdh6kj2KHGWKoIkdSRrJq5Mp7s+Ib1V5ogL85PrDMKxOTGHtnt8H7ibb8emK3JLLeE2WPNj4V2SfBHNKYrHEY6Woi47/O4p+i2ksZDz1yXuxzS7B/5Qs7Ky9vZ1+kDAB8LFnoT2orEsbMp3jzKoot4YLWcR5UgWE+DhWEne8faXbuPkcJDfKyus6eDKdkWV50wOZjcGOfj7reqZkPgGUsEHwsDIQcuzXeUfrjMZODNzFA5Gjj3xQ8eSrd+D7z174Nq+oMT8D5Fsy+aJaw8dz3c/h2KmsOKKBOP2lAKryJXiK+apiRPxSzY6Kms8DKJpMYURh2JgHGG0gIxbiG6ldml6ZTvDs013cBla07F5RHZ663sTfL0l+PFAp1gWV4ZqZBoMRjReGQlZRwgfaA40LeQpw5YdmuPp6EZJpZ6BHt+CXf3Capuvq1+OVIHb5s7Eqc0ZTJxa1Te7Pg+twBwJpxxcHatlT6grrMvBbHNeepJ62in3jpfWJ6+zrSrLtbYjYLureIRY6VkVsfJpd7c/tj3PHNrh9CL0L+3QMj8XBVdjM+IA/J9gHjF4/hYYiTA8YQdrwpPdlXzTHdp+OBhNg1ImprDOwQrhaJCSPNlbkkIeLccDV21WLwiVkLtIi9rtcur5Xtm8NYf25Eg/8LgpzVRHdqC6aJeE8coWG17tKH6nRRn6rjnxZqYrwtJlMLTDmTm0n2wLlUX7NMIsiyjE/DJfwlm0hDV7b3h7hDTvN3MmY8XzyfG+RZnqvT0YanKGoTsNZtdnB9c7WIk+iB+i+IyXlOTZ5qyx8BRV3oGy8yr4ZI+ECUpywouROfT6RoHOUNmsXxCgy3LxWX5dRUTJUBV7kx0/ErRMbD/07fFsZPp2sxdtJ0tJYMhDDtdZGnEomdeeI70KpyHWMxZptHx6CV/JspJHJU+qeg0GhV9zyLg8YiM57/ferYGxXb6CgzjJCMK8n2N0+6HT6dAc1znf/mwzEt+A7QpKc6xf8NtmKYrhDnyxk6pq/7II+wEwuN5AOiBr4TZAKcSd2L7thaKAc6aTD4bebXfbXf0e6L322c/trr5Xnj1T8BX9f5HoQzeY+M7YlhroN4i4T+Ga8JoYinqvXoCUWC3Huwr9z7PDweFpXM8RTtYkx/ywtwYY8S+aC7/miELWFzMMNaXApJkLDmnTi9JJj6dB747FPC3ToHo61bHFBr4piNYMPxg5Y8f3Dgjs4A4O8m1GD1K0Rrxe9jx4dwKfRQ1aMlo81hpRniiKJ9PQCmaiOJ6OHW8QTAMv/OQ61jPSk1pnQqw8m+IZJWvE4vwTRYnITkdentKdPWH5fJ5jnns4ytiKcHXsU2l5Z7RcsLnX++AM7xSiqmh+liS9GPZ+Nro/v4fG2+6b2Ji/eXdmRL33Zz0Iz7o/QyjMnt2xzjxnnc1a/F9snjqrTZhzlHZyLMx7e95enK333qA//vJV/sC6yi80bstuSj0oXJsjxzJ9ZzoJbdftdzXNnDnFxkmdELq27zq213/XLXVYg5CC6vfBj+3icDtF+Kb9467sDmHsdeXlIBmg5RHjHuJ70P9v8J+/d433X/7+R7v5u3VwKWvi7axU0/dTGTiM+KxAXLuG8WileqDBqToAXr/16pADRBkSkRDSCUsJuckzHehN58c7gqxRew964KwLcDEbVLn6HTAknn63QQn664o8z/f6xUWbnbaVGG+QQ8vzPcFt9yGjYuUtIQ8X3W8yubZ00R/13vkv7fM37d7Z+3bvXP8RNPeZ9qxabm2vfvHC2jKqZSCkM5pOr0SBWHZvHrB3IsZDuAqZnNTo26p4cIpy6+50rw6lcQyMzb+anOnt2zeyhaVkfwxMQJ3AcHWBoFT9o/vU/6fs1fLXidcgZA/osYsQIMIJuEHxjQAki0UJXMBllMiLlREvu3SqkaX6S4fuPwgI2TifI9xZRziZi5pG0VXgXyCM2AomxUI7K4AXVfLcbUfuM/mSwjkhHFBVyCU/ATUgeMEkgQBh0ANrhHMOXyqqynuqwIiBzlY5T8g3DAwKeuCF/ox83HSpNMfFtdJ9k3wa6r3TvGBi+r49sWwrDGZD17TsQ/Xf9hMEZeC3HLevSugo4+KfLI7bSef9+wxSRBIU6wcOfVqvEkRxtJZX1nYw3uuv9853SB6vGsB2gOLVmiSge/727WOQSsnmzP/wYVYQ+eGDsjVjFsU30RIaI8SEd/f0X1+Cjx+fhxFHnEOcwMQIsiWNEngyvu01zxyvI3Yjb4omEUrvyg3DdsTIFfJqK9GMCMpTgP8LRCIq0QY0cvwAkvL2qmFgYsxTsRs+EWEd33OQNzHXdNryqAfC9ImnRH+B49XP/03ffBR+a5vqEGhrkqVFIiavrbA8ywjlMAHzO3AT8Uhd7GA/gW8oTSXIHBaqT17u2v5+PbGrjOL+EkjwwhCpYh1xFBuYcLS4I7jU9hEEjJPs+bML/9mdX15tKl1g55zA++z59njgj/aPvp6xgLLY/wX6vbO7v26VmqUXP+tHZ7q6YgrUDfEqq7bFXgGoMkds8DGMOSIYxCsY34CYJPCDDlq79ceRsziIk8aL6Nu+Y9PJj8j5KiGc+qcemqYEs0eYpv3Nnl78TwAAAP//tXl5uWUyAAA= + H4sIAAAAAAAA/9Rbe3fbtpL/n58C5dXJo7fUw0ncJr3KPYxIyzzWa0nK3Wyb5aFISMKaAhgAVOybej/7HgAkRcmkZHu7f6zPaW1Bg8HMYB4/DJC//dBZINxZhGyt2a4bXDgjO/jN9AeXge+M7enc758DjUEOjFsNLcHvwFiCDkl5J/xXRmEnIpiHCEPKOiklW8QQwe2IbNIEcgi+/Ar4GmINyB8YrQnQzYTCML4DNMSAE8CyKIKMAXiLOMKrdrutF+S3iIOutkSaFqZ8E9Kb38wRwtmtuYKYgzVJYvBC00bTYWA5br+zDWknIatcsPCGaZubGFFgpKD1Pae61xIMDAYOiKMkYxxSY6dCQlbgj1yQU8RGxKBBMp5mfH/ezkw/tv+LEVz3TZSQLDYQRtxYogSydhpuYVxHuV0LOsbDJNlZuKDbadjRtPSOrwl+c2qfAgrjMOKBFCGICF6iVTu9y3kahhJNjRtpyNe5JdBCSd2R0uCoUCLnwG95yUJZRU2uiHhIr2nzT/OJPw9ce2Sbnt1vvUrYIqAwgSGDwKDAYK+l+/0OWt/3ae9Bvw/03nm7+1YHX6oex7KYgDDlxkq47x0IM04o3JAtBNGaEnynlV7Z+uduBrtjHG4ingAKGQ8pz0dig6MNZHc4iqVTqomv4pDD1z+1Xq0J4zjcwNc/ATkryhgnGxZRlPKPH+VWbDRtSShAAGHQesXgV9ADb8673de/gphIAVSEMaC3vg88O7i0RzPb9WRUzkz/8l4/CCkAVhSmwLj4Cl7+Lae2pxcvjzB48QIsKAxvJIcl2i3bQsCAX6VAD1aRsdiqTxDKigmDJTVLIExBr1ghJhhqDMbAQEDvVMTsxHqzoBojGY3gEYIDCsvxfHd6mpMz8XxzNGomyBmdpBtMJxfOcE8i5aJ667vleOankR14nrC58FBOM3jgoDFi4SKBnncJ/vyzYuPK5J2n6SlF25BDAFdUJMyUkts7EMax/IQYeNn6PnOda9O3A3vo2p4XzNzpv38OTMsSn+5fVuXzLqfzkZWrMHft4NL3Z2pCs7yPmR0MzGYG4kdFfUahmDMTSgzMffXnM0soMTCDge36XtVRy8k2j2y8RZTgDcRcWumIcoO550/HgqPvzj2/WcCS/0BG7yAcQMrREkXC8EeFFBIoAQwsZJjO/U/T+URIMR6bE+u+1paKVhnu2nS9QyoZWtswAa0dTdUeFHJ6F23iAC2DZYiSjELwrgt64B1oHUoAPn58cik7+/iit693hetkElyYzuhXqXseGh3Iow5hRp66tTJpO9Y9+KEP9E1IRRk60FN5uCuSM8IrsAmxES9kwjayVGRYsEzCFRAVskQICVmxgJMAbiHmDOjmldceeHZbpfhxiK2FmXEyl/MvknB1gRKog6Nfq3C7TQnlAuiwNcmSOGA3KA3wFsUoDGKKtpAy7eFYkBfnfutVzbYEmASMh5yBntifXhcIzAWM6PbIKq81Cnm/9c/StSnkujRjt9aAFyFKYCxgVQw5pBuEoXA0xRQopiAXM18WLCAQK6cwVmbdbfXk2rEcM7Bc59p2i3RYcXS99X04mweTqWXfK6mKiBIuowiazdQchE0bGyUwxPN0OJtbyjw6eDAkxWtiUORbVc5dyEiyhbEO6seb+ZRZwow3CM+ZcOeHY5p2fWkFo+lwV4v6J+BcibBbD6aCh7st9jjiMAYrksQQA7QJVxCkFBZ8j8dJbrtBgQwdMX1n04NxyepiPhqVddG1/23uuLbVX4ai+JcIoHQOxwuuL0Xi6wOxyzWZTaoxZyLkry8tsQ+cErDIuIz0OitgwsGSZDjWa7CJIJf4ZDL1gwuRpaq5sl54IVnFp1tTT7hlK8eYUy+YmGNbuPSLF0BoVctFqFh48iMcOd8eC6ZMB5UPOxsqywwr+/qrilJhqhimEMcQRwiyYnrIEcH6Ue/PKct9dTMsAG0pweEXyhn11veJbVueyPe+6Uxs19qP3MIw3317ZM+mrh/YE4FeDsiUWcBj7OLDBIoMHM+SbIVwKeDBuCo7kGfpYOJYiLKTqk8g/0bozQHbvVGt1NrxgisBFka2X6fJUUVi8g0nJIyvaMZ4InJ2MVIaOf4tZBtvjTas9D6xqrJd4NkDgVv8kRd8mk59z3fN2cyZDJ8tiQejjEJ/5H0ihDNOw/QqW8AEcvsWRoVBnkAshXZtIdxBHjhyLtI9eZwqUqXw5eFsntclpteWlTJ3SD87XVN+eFpNgZhlFFZLyuHIfk7L90cIaNnXzsAOZqP50JkEzkUg4sQ+lu9KLmNnWOpXLZtKRWMJdImj8nNn/rujVDZiuEURNFK5D20GqfhYgxvFT9kBeTLDdiXDih8O4XOYdHpdY4NWgfAiDld3snbq4CPoxHDbwVmSgH/846U4smq/e2rSF62C7Pu6sJXwf98efu4bgplRMAOiciRQ14RfSt/qV/7sZExg3ShMchllp6tOXNCqLiK01ezpRal+Xj+OuZE88bfreOtALxsKNhYww8SxioN68j20/dDPPN90fYm7H567m6Uj6UnhLAWCpHQkrReuKKf7MSGjVdaIC/OT6wyCsTkxh7Z7/By4X2/HpitqS6Xg1njzqfQuRb4IFxRF4xCHK4HLmr97yv7m1ljK+ZuC96mdPSB/uLMSWXuHe/rAwA3p4sBCB9lYApviu5MKqqw3RqtZSDmSYAI8HCvEO97+0m0cNyf5A1hhTQdXtitQnjNprG4McvD3W9UzIdENpEIPhIGRgZZnuyo+XGcycGbmKBiMHHviB44lW7+N33v2wLV9IYn5H6LYFs0T1x46nu9+DsRM4cWlCMbtYwBWXivFr4gnJo7FX7LRUXpjM4mmRRSGHIqBcYjREjJuIbqz2qXpFe0MzzbdwWVgTcfmEdvpre919NWW4MeGTrEEV4ZqZBoMhjRaGzHZhAg3NAfqFvKUY8sOzfFydKOsUq1Ap49gV7+wyuHr6pcjKHDX3Jk4lTmDiVNBfbPr88CamyMRlIOrY1j2EbjCuhzMtudFJKlPe3DvOLR+9Do7VFmstRsBu1PFCWFlZJXCyk/7p/2x7Xnm0A6mF4F/aQeW+TkHXLXNiAb6P8EiZPD8LTBi4XjCDzaEx/sr+aY7tP1gMJrOC5uYwjsHa4TDQUKy+GBJCnm4Gg9cdVi9IFRS7jPNsdvl1PO9onlrDu3JkX7gcVeaqY7sQHXRLgnjpS/WfLW38XstysB3zYk3M12Rli7nQzuYmUP7yb5QerRPQ8zSkELML7MVnIUrWPH3mm+PiOb9Zs5krni+ON63MFW9twdDdcEwdKfz2fVZ43qNSPRB/hDgM1pRkqXbs1rgKVBeA+y8mn+yR8IFpTjBxcgcen0jZ2eoatbPBdAlXHxWXJcZUSpU5t54L46ELBPbD3x7PBuZvl0fRbvJ0hIY8oDDTZqEHErltedYr+RpiPWMZRKung7hS1uW9ijtSVWvwaDwawYZl1dsJOP93rsNMHbLl3QQxylBmPczjG4/dDodmuGq5rs/24xEN2C3gto51s/1bbMERXCPPj9Jldi/AGE/AAY3W0gHZCPCBqgNcSe2b3uBAHDOdPLB0Lvtbrur3wO91z77ud3VD+DZMw1fyv8XmT5w5xPfGdtyB/o1Ju5TuCG8YoYc71UBSMHVcryrwP88a04OT9N6gXC8IRnmzdE6x4h/0Vz4NUMUsr6YYagpOSfNXHJI674ogvR4GfTuWMSTogyqT48NbHGAr0uiFcefj5yx43sNBms8wUG+q+jzBG0Qr8KeB989Qs8cgxaK5h8rjShPgOLJNLDmMwGOp2PHG8yncy/45DrWM8qTWmdCrCyd4hklG8Si7BNFsahOR758VHdWXTg86jTZJF+2yDDPPBymbE24uhcq3WBvtJCovhn84JKvUeq6dvhZHPci2PvZ6P78Hhpvu28iY/Hm3ZkR9t6f9SA86/4MoYgLdsc6i4x1thvx//x01Vlvg4yjpJNh4f+7C/n88r33Bv3xl6/yB9ZVAaJRW7Zbqlnj2hw5luk700lgu26/q2nmzMlPVuoK0bV917G9/rtusckVCmmofh/82M5vvxOEb9o/7tuuiWOvK18PyQwu7yAPGN+D/n+D//y9a7z/8vc/2vW/W41LWRNvb6XKfj9VgWbGZznjyjuNk1C2oQOqWgRev/WqKQDCFIlUCemEJYTcZKkO9LoL5j1DVqS9Bz1w1gU4nw3KYv4OGJJPv1uzCfrrUjzP9/r5S5y9vpYYr7FDy/M9oW33oaJi5Z0gDxc97EK5tgzRH/Xe+S/t8zft3tn7du9c/xHUN6IOvFqefa9+8YLKMqqnIKwzmk6vBIIs2jsP1HskxyZeuU0e1QncbfHgMZtbDad7dWuNI2Bs/1UXTG/fvpE9LmX7Y2SC6hEKly8Miq0/eZD9f6pepcA98p2EbBKdeikBQhyDGxTdCEKyXBbEOV1KiXx5GfKijac6XaoB1fRAQlDIzvoC4c4mxPFCgB4lV85/iTBiaxjnC+2tAF6UxXO/X3mo5EsKF4RwQBXSi38CakDogkkMAcKgBzYIZxy+VFIVD1mBEQGdrTMek28YGBT0wAv9GfW47tVphvN3p4cu+TTWB9d984np+/bEsq1gPhu6pmU3AcTdz3xeJH7LcfsKY4cpF/9J9NyOO+/fp5AiEqNIb7gVar2KEcXhRr5p2+N4r78+uAAiWbSuIdsjitYbEoPu+du3pyjVJpsz/8OHWS7khw/K14xZGN2EK2iMEBPR3dN/fQk+fnweRxxyDnEMY2OermgYw0fz270DzfAmZDfyKWkcouSuOFHsRoxMMS/PGvWMoLwm+L9gJLISrWEjxxuYFM9bDQMTY5GI4/IjGVb5PYd5nXJ11zEnIxAmT7xG+gsCr/pAwPTNk/Q731S3RDuXLDwSMfmuhWVpSiiHMVjcgZuQh+rlB/sJfENJIkkWMN/6+OW+7x/iif3NyB84gRgvDVEqNiFHkYEJR8s7govdPsKAcZI+f3YeP/vzi7dPRQjsXSR4nz3fHg/80eHd2DMWUB77v2B/cLn3161S8fT8z+rdmq7eoAL1hLysqm1xVgAK5oCIYAwjjggG0RpGNyAiMfygg9Y+/jhyWQdxXPtSfdeYrLsaEjVfFYTH/lsQTVOGORBM0/5mTy/+JwAA//9dgNZDhjIAAA== - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 80831aed394..9055c6b2b4a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index c0e1fd61183..e5b5b244b8b 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index a24ef4a9199..fd7aaad241e 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 1edb35dc18e..a9099a1cb5a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 48c037c4aa6..005471b39da 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line126.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line133.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line140.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line147.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line154.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line161.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line168.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line213.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line220.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line311.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804+krustlet/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804+krustlet/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 9f06cdb67cd..7c5181acabf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line126.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line133.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line140.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line147.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line154.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line161.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line168.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line213.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line220.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line311.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index c60d02084cc..07a77e21d56 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line126.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line133.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line140.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line147.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line154.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line161.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line168.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line213.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line220.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line312.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line312.sh rename to pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line126.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line126.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line133.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line133.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line140.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line140.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line147.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line147.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line154.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line154.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line161.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line161.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line168.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line168.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line213.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line213.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line220.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line220.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line311.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line311.sh rename to pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index e43fc0eb157..21f8de45bf3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line311.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+China/line311.sh rename to pkg/agent/testdata/AKSUbuntu2204+China/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+China/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index 0372db1d455..e4e8492431b 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line227.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line229.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line227.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line229.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line318.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line320.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line318.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line320.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 5cb6fe3a476..75af18d862d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line227.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line229.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line227.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line229.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line318.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line320.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line318.sh rename to pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line320.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index 703dd4fddbd..453053b6aef 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9Q7a3Pbtpbf+StQXk0evaUeTuI26VXuMCItc6zX8uFuts1yKBKSsKYABgAV+6be374DgKQomZJlb/fDaiaRCB4cnPc5OID/9kNnjnBnHrGVZrtueOGM7PA30x9chr4ztqeB3z8HGoMcGLcaWoDfgbEAHZLxTvSvnMJOTDCPEIaUdTJKNoghgtsxWWcp5BB8+RXwFcQakB8YrwjQzZTCKLkDNMKAE8DyOIaMAXiLOMLLdrutl+C3iIOutkCaFmV8HdGb38wRwvmtuYSYgxVJE/BC00bTYWg5br+ziWgnJcuCsOiGaeubBFFgZKD1vYC611IMDAb2gOM0ZxxSY8tCSpbgj4KQx4CNmEGD5DzL+e68rZh+bP8XI7jpTZySPDEQRtxYoBSydhZtYNIEuVkJOMajNN1KuITbctjRtOyOrwh+85ieQgqTKOahJCGMCV6gZTu7K3AahiJNjRtZxFeFJNBcUd2R1OC4ZKLAwG95hUJJRU2ukbgPr2nBp2DiB6Frj2zTs/utVymbhxSmMGIQGBQY7LU0v99B6/su7D3o94HeO2933+rgS93iWJ4QEGXcWArzvQNRzgmFa7KBIF5Rgu+0yipb/9zOYHeMw3XMU0Ah4xHlxUhicLSG7A7HiTRKNfFVEnH4+qfWqxVhHEdr+PonIGfFOeNkzWKKMv7xo1TFWtMWhAIEEAatVwx+BT3w5rzbff0rSIgkQHkYA3rr+8Czw0t7NLNdT3rlzPQv7/U9lwJgSWEGjIuv4OXfCmh7evHyCIIXL8CcwuhGYlig7bItBAz4VRL0YBXpi63mAKGkmDJYQbMUwgz0yhUSgqHGYAIMBPROjcxOoh8mVGMkpzE8ArAHYTme704fx+RMPN8cjQ4DFIgehRtMJxfOcIciZaJ667vleOankR16npC5sFBOc7hnoAli0TyFnncJ/vyzJuPa5K2l6RlFm4hDAJdUBMyMkts7ECWJfEIMvGx9n7nOtenboT10bc8LZ+703z+HpmWJp/uXdfq8y2kwsgoWAtcOL31/piYcpveU2eHAPIxAfJTX5xSKOTPBxMDcZT+YWYKJgRkObNf36oZaTbZ5bOMNogSvIeZSSkeYGwSePx0LjL4beP5hAiv8A+m9g2gAKUcLFAvBHyVSUKAIMLCgYRr4n6bBRFAxHpsT675RlgpWCe7adL19KOlamygFrS1MXR4UcnoXr5MQLcJFhNKcQvCuC3rgHWjtUwA+fnxyKjv7+KK3y3cN62QSXpjO6FfJe+EaHcjjDmFGEbq1Kmg71j34oQ/0dURFGtrjU1m4K4IzwkuwjrCRzGXANvJMRFiwSKMlEBmyqhBSsmQhJyHcQMwZ0M0rrz3w7LYK8eMIW3Mz5ySQ8y/SaHmBUqiDo6+Vu91mhHJR6LAVydMkZDcoC/EGJSgKE4o2kDLt4VhYJOd+61WDWkJMQsYjzkBP6KfXBaLmAkZ8e2SV1xqFvN/6Z2XaFHJdirHbKMCLCKUwEWVVAjmka4ShMDSFFCikoCCzWBbMIRArZzBRYt2qenLtWI4ZWq5zbbtlOKwZut76PpwF4WRq2feKqtKjhMkogMNiOuyEhxQbpzDCQTacBZYSjw4eDEnyDiEo461K5y5kJN3ARAfN44fxVFHCTNYIB0yY88MxTbu+tMLRdLjNRf1Hyrmqwm49mAoealvoOOYwAUuSJhADtI6WEGQUlniP+0khu0FZGTpi+lame+MS1UUwGlV50bX/LXBc2+ovIpH8qwqgMg7HC68vReDrA6Hlhsgm2QiYcPnrS0vogVMC5jmXnt4kBUw4WJAcJ3pDbSLAZX0ymfrhhYhS9VjZTLygrGbTraknzLJV1JhTL5yYY1uY9IsXQHDViEWwWFryCYZcqMeCGdNB7WErQyWZYU2vvyovFaJKYAZxAnGMICunRxwRrB+1/gKy0qubY1HQVhTsv1DGqLe+T2zb8kS8901nYrvWrueWgvnu2yN7NnX90J6I6mUPTIkFnCIXH6ZQROBkluZLhCsC98ZV2oE8zwYTx0KUPcr6BPJvhN7sod0Z1SquHS+8EsXCyPabODnKSEK+4ZREyRXNGU9FzC5HKiEnv0Vs7a3QmlXWJ1ZVsgs9eyDqFn/khZ+mU9/zXXM2cybDZ1PiwTin0B95nwjhjNMou8rnMIXcvoVxKZAnAEuiXVsQtxcHjuyLdE9up8pQKWx5OAuKvMT0xrRSxQ5pZ4/nlB+ellMgZjmF9ZSyP7Ib0wr9CAIt+9oZ2OFsFAydSehchMJP7GPxrsIydoYVf/W0qVg0FkCXdVSx7yy+O4plI4EbFEMjk3poM0jFY0PdKD5VB+TJCNu1CCs+HMLnIOn0usYaLUNhRRwu72Tu1MFH0EngpoPzNAX/+MdLsWXVfvfUpC9arbLv60JWwv59e/i5bwhkRokMiMyRQl0Tdiltq1/72cmZqHXjKC1olJ2uJnJBq76I4FazpxcV+0X+OGZGcsffbsKtA71qKNhYlBkmTpQfNIPvVNsP7czzTdeXdffDffdh6kj2KHGWKoIkdSRrJq5Mp7s+Ib1V5ogL85PrDMKxOTGHtnt8H7ibb8emK3JLLeE2WPNj4V2SfBHNKYrHEY6Woi47/O4p+i2ksZDz1yXuxzS7B/5Qs7Ky9vZ1+kDAB8LFnoT2orEsbMp3jzKoot4YLWcR5UgWE+DhWEne8faXbuPkcJDfKyus6eDKdkWV50wOZjcGOfj7reqZkPgGUsEHwsDIQcuzXeUfrjMZODNzFA5Gjj3xQ8eSrd+D7z174Nq+oMT8D5Fsy+aJaw8dz3c/h2KmsOKKBOP2lAKryJXiK+apiRPxSzY6Kms8DKJpMYURh2JgHGG0gIxbiG6ldml6ZTvDs013cBla07F5RHZ663sTfL0l+PFAp1gWV4ZqZBoMRjReGQlZRwgfaA40LeQpw5YdmuPp6EZJpZ6BHt+CXf3Capuvq1+OVIHb5s7Eqc0ZTJxa1Te7Pg+twBwJpxxcHatlT6grrMvBbHNeepJ62in3jpfWJ6+zrSrLtbYjYLureIRY6VkVsfJpd7c/tj3PHNrh9CL0L+3QMj8XBVdjM+IA/J9gHjF4/hYYiTA8YQdrwpPdlXzTHdp+OBhNg1ImprDOwQrhaJCSPNlbkkIeLccDV21WLwiVkLtIi9rtcur5Xtm8NYf25Eg/8LgpzVRHdqC6aJeE8coWG17tKH6nRRn6rjnxZqYrwtJlMLTDmTm0n2wLlUX7NMIsiyjE/DJfwlm0hDV7b3h7hDTvN3MmY8XzyfG+RZnqvT0YanKGoTsNZtdnB9c7WIk+iB+i+IyXlOTZ5qyx8BRV3oGy8yr4ZI+ECUpywouROfT6RoHOUNmsXxCgy3LxWX5dRUTJUBV7kx0/ErRMbD/07fFsZPp2sxdtJ0tJYMhDDtdZGnEomdeeI70KpyHWMxZptHx6CV/JspJHJU+qeg0GhV9zyLg8YiM57/ferYGxXb6CgzjJCMK8n2N0+6HT6dAc1znf/mwzEt+A7QpKc6xf8NtmKYrhDnyxk6pq/7II+wEwuN5AOiBr4TZAKcSd2L7thaKAc6aTD4bebXfbXf0e6L322c/trr5Xnj1T8BX9f5HoQzeY+M7YlhroN4i4T+Ga8JoYinqvXoCUWC3Huwr9z7PDweFpXM8RTtYkx/ywtwYY8S+aC7/miELWFzMMNaXApJkLDmnTi9JJj6dB747FPC3ToHo61bHFBr4piNYMPxg5Y8f3Dgjs4A4O8m1GD1K0Rrxe9jx4dwKfRQ1aMlo81hpRniiKJ9PQCmaiOJ6OHW8QTAMv/OQ61jPSk1pnQqw8m+IZJWvE4vwTRYnITkdentKdPWH5fJ5jnns4ytiKcHXsU2l5Z7RcsLnX++AM7xSiqmh+liS9GPZ+Nro/v4fG2+6b2Ji/eXdmRL33Zz0Iz7o/QyjMnt2xzjxnnc1a/F9snjqrTZhzlHZyLMx7e95enK333qA//vJV/sC6yi80bstuSj0oXJsjxzJ9ZzoJbdftdzXNnDnFxkmdELq27zq213/XLXVYg5CC6vfBj+3icDtF+Kb9467sDmHsdeXlIBmg5RHjHuJ70P9v8J+/d433X/7+R7v5u3VwKWvi7axU0/dTGTiM+KxAXLuG8WileqDBqToAXr/16pADRBkSkRDSCUsJuckzHehN58c7gqxRew964KwLcDEbVLn6HTAknn63QQn664o8z/f6xUWbnbaVGG+QQ8vzPcFt9yGjYuUtIQ8X3W8yubZ00R/13vkv7fM37d7Z+3bvXP8RNPeZ9qxabm2vfvHC2jKqZSCkM5pOr0SBWHZvHrB3IsZDuAqZnNTo26p4cIpy6+50rw6lcQyMzb+anOnt2zeyhaVkfwxMQJ3AcHWBoFT9o/vU/6fs1fLXidcgZA/osYsQIMIJuEHxjQAki0UJXMBllMiLlREvu3SqkaX6S4fuPwgI2TifI9xZRziZi5pG0VXgXyCM2AomxUI7K4AXVfLcbUfuM/mSwjkhHFBVyCU/ATUgeMEkgQBh0ANrhHMOXyqqynuqwIiBzlY5T8g3DAwKeuCF/ox83HSpNMfFtdJ9k3wa6r3TvGBi+r49sWwrDGZD17TsQ/Xf9hMEZeC3HLevSugo4+KfLI7bSef9+wxSRBIU6wcOfVqvEkRxtJZX1nYw3uuv9853SB6vGsB2gOLVmiSge/727WOQSsnmzP/wYVYQ+eGDsjVjFsU30RIaI8SEd/f0X1+Cjx+fhxFHnEOcwMQIsiWNEngyvu01zxyvI3Yjb4omEUrvyg3DdsTIFfJqK9GMCMpTgP8LRCIq0QY0cvwAkvL2qmFgYsxTsRs+EWEd33OQNzHXdNryqAfC9ImnRH+B49XP/03ffBR+a5vqEGhrkqVFIiavrbA8ywjlMAHzO3AT8Uhd7GA/gW8oTSXIHBaqT17u2v5+PbGrjOL+EkjwwhCpYh1xFBuYcLS4I7jU9hEEjJPs+bML/9mdX15tKl1g55zA++z59njgj/aPvp6xgLLY/wX6vbO7v26VmqUXP+tHZ7q6YgrUDfEqq7bFXgGoMkds8DGMOSIYxCsY34CYJPCDDlq79ceRsziIk8aL6Nu+Y9PJj8j5KiGc+qcemqYEs0eYpv3Nnl78TwAAAP//tXl5uWUyAAA= + H4sIAAAAAAAA/9Rbe3fbtpL/n58C5dXJo7fUw0ncJr3KPYxIyzzWa0nK3Wyb5aFISMKaAhgAVOybej/7HgAkRcmkZHu7f6zPaW1Bg8HMYB4/DJC//dBZINxZhGyt2a4bXDgjO/jN9AeXge+M7enc758DjUEOjFsNLcHvwFiCDkl5J/xXRmEnIpiHCEPKOiklW8QQwe2IbNIEcgi+/Ar4GmINyB8YrQnQzYTCML4DNMSAE8CyKIKMAXiLOMKrdrutF+S3iIOutkSaFqZ8E9Kb38wRwtmtuYKYgzVJYvBC00bTYWA5br+zDWknIatcsPCGaZubGFFgpKD1Pae61xIMDAYOiKMkYxxSY6dCQlbgj1yQU8RGxKBBMp5mfH/ezkw/tv+LEVz3TZSQLDYQRtxYogSydhpuYVxHuV0LOsbDJNlZuKDbadjRtPSOrwl+c2qfAgrjMOKBFCGICF6iVTu9y3kahhJNjRtpyNe5JdBCSd2R0uCoUCLnwG95yUJZRU2uiHhIr2nzT/OJPw9ce2Sbnt1vvUrYIqAwgSGDwKDAYK+l+/0OWt/3ae9Bvw/03nm7+1YHX6oex7KYgDDlxkq47x0IM04o3JAtBNGaEnynlV7Z+uduBrtjHG4ingAKGQ8pz0dig6MNZHc4iqVTqomv4pDD1z+1Xq0J4zjcwNc/ATkryhgnGxZRlPKPH+VWbDRtSShAAGHQesXgV9ADb8673de/gphIAVSEMaC3vg88O7i0RzPb9WRUzkz/8l4/CCkAVhSmwLj4Cl7+Lae2pxcvjzB48QIsKAxvJIcl2i3bQsCAX6VAD1aRsdiqTxDKigmDJTVLIExBr1ghJhhqDMbAQEDvVMTsxHqzoBojGY3gEYIDCsvxfHd6mpMz8XxzNGomyBmdpBtMJxfOcE8i5aJ667vleOankR14nrC58FBOM3jgoDFi4SKBnncJ/vyzYuPK5J2n6SlF25BDAFdUJMyUkts7EMax/IQYeNn6PnOda9O3A3vo2p4XzNzpv38OTMsSn+5fVuXzLqfzkZWrMHft4NL3Z2pCs7yPmR0MzGYG4kdFfUahmDMTSgzMffXnM0soMTCDge36XtVRy8k2j2y8RZTgDcRcWumIcoO550/HgqPvzj2/WcCS/0BG7yAcQMrREkXC8EeFFBIoAQwsZJjO/U/T+URIMR6bE+u+1paKVhnu2nS9QyoZWtswAa0dTdUeFHJ6F23iAC2DZYiSjELwrgt64B1oHUoAPn58cik7+/iit693hetkElyYzuhXqXseGh3Iow5hRp66tTJpO9Y9+KEP9E1IRRk60FN5uCuSM8IrsAmxES9kwjayVGRYsEzCFRAVskQICVmxgJMAbiHmDOjmldceeHZbpfhxiK2FmXEyl/MvknB1gRKog6Nfq3C7TQnlAuiwNcmSOGA3KA3wFsUoDGKKtpAy7eFYkBfnfutVzbYEmASMh5yBntifXhcIzAWM6PbIKq81Cnm/9c/StSnkujRjt9aAFyFKYCxgVQw5pBuEoXA0xRQopiAXM18WLCAQK6cwVmbdbfXk2rEcM7Bc59p2i3RYcXS99X04mweTqWXfK6mKiBIuowiazdQchE0bGyUwxPN0OJtbyjw6eDAkxWtiUORbVc5dyEiyhbEO6seb+ZRZwow3CM+ZcOeHY5p2fWkFo+lwV4v6J+BcibBbD6aCh7st9jjiMAYrksQQA7QJVxCkFBZ8j8dJbrtBgQwdMX1n04NxyepiPhqVddG1/23uuLbVX4ai+JcIoHQOxwuuL0Xi6wOxyzWZTaoxZyLkry8tsQ+cErDIuIz0OitgwsGSZDjWa7CJIJf4ZDL1gwuRpaq5sl54IVnFp1tTT7hlK8eYUy+YmGNbuPSLF0BoVctFqFh48iMcOd8eC6ZMB5UPOxsqywwr+/qrilJhqhimEMcQRwiyYnrIEcH6Ue/PKct9dTMsAG0pweEXyhn11veJbVueyPe+6Uxs19qP3MIw3317ZM+mrh/YE4FeDsiUWcBj7OLDBIoMHM+SbIVwKeDBuCo7kGfpYOJYiLKTqk8g/0bozQHbvVGt1NrxgisBFka2X6fJUUVi8g0nJIyvaMZ4InJ2MVIaOf4tZBtvjTas9D6xqrJd4NkDgVv8kRd8mk59z3fN2cyZDJ8tiQejjEJ/5H0ihDNOw/QqW8AEcvsWRoVBnkAshXZtIdxBHjhyLtI9eZwqUqXw5eFsntclpteWlTJ3SD87XVN+eFpNgZhlFFZLyuHIfk7L90cIaNnXzsAOZqP50JkEzkUg4sQ+lu9KLmNnWOpXLZtKRWMJdImj8nNn/rujVDZiuEURNFK5D20GqfhYgxvFT9kBeTLDdiXDih8O4XOYdHpdY4NWgfAiDld3snbq4CPoxHDbwVmSgH/846U4smq/e2rSF62C7Pu6sJXwf98efu4bgplRMAOiciRQ14RfSt/qV/7sZExg3ShMchllp6tOXNCqLiK01ezpRal+Xj+OuZE88bfreOtALxsKNhYww8SxioN68j20/dDPPN90fYm7H567m6Uj6UnhLAWCpHQkrReuKKf7MSGjVdaIC/OT6wyCsTkxh7Z7/By4X2/HpitqS6Xg1njzqfQuRb4IFxRF4xCHK4HLmr97yv7m1ljK+ZuC96mdPSB/uLMSWXuHe/rAwA3p4sBCB9lYApviu5MKqqw3RqtZSDmSYAI8HCvEO97+0m0cNyf5A1hhTQdXtitQnjNprG4McvD3W9UzIdENpEIPhIGRgZZnuyo+XGcycGbmKBiMHHviB44lW7+N33v2wLV9IYn5H6LYFs0T1x46nu9+DsRM4cWlCMbtYwBWXivFr4gnJo7FX7LRUXpjM4mmRRSGHIqBcYjREjJuIbqz2qXpFe0MzzbdwWVgTcfmEdvpre919NWW4MeGTrEEV4ZqZBoMhjRaGzHZhAg3NAfqFvKUY8sOzfFydKOsUq1Ap49gV7+wyuHr6pcjKHDX3Jk4lTmDiVNBfbPr88CamyMRlIOrY1j2EbjCuhzMtudFJKlPe3DvOLR+9Do7VFmstRsBu1PFCWFlZJXCyk/7p/2x7Xnm0A6mF4F/aQeW+TkHXLXNiAb6P8EiZPD8LTBi4XjCDzaEx/sr+aY7tP1gMJrOC5uYwjsHa4TDQUKy+GBJCnm4Gg9cdVi9IFRS7jPNsdvl1PO9onlrDu3JkX7gcVeaqY7sQHXRLgnjpS/WfLW38XstysB3zYk3M12Rli7nQzuYmUP7yb5QerRPQ8zSkELML7MVnIUrWPH3mm+PiOb9Zs5krni+ON63MFW9twdDdcEwdKfz2fVZ43qNSPRB/hDgM1pRkqXbs1rgKVBeA+y8mn+yR8IFpTjBxcgcen0jZ2eoatbPBdAlXHxWXJcZUSpU5t54L46ELBPbD3x7PBuZvl0fRbvJ0hIY8oDDTZqEHErltedYr+RpiPWMZRKung7hS1uW9ijtSVWvwaDwawYZl1dsJOP93rsNMHbLl3QQxylBmPczjG4/dDodmuGq5rs/24xEN2C3gto51s/1bbMERXCPPj9Jldi/AGE/AAY3W0gHZCPCBqgNcSe2b3uBAHDOdPLB0Lvtbrur3wO91z77ud3VD+DZMw1fyv8XmT5w5xPfGdtyB/o1Ju5TuCG8YoYc71UBSMHVcryrwP88a04OT9N6gXC8IRnmzdE6x4h/0Vz4NUMUsr6YYagpOSfNXHJI674ogvR4GfTuWMSTogyqT48NbHGAr0uiFcefj5yx43sNBms8wUG+q+jzBG0Qr8KeB989Qs8cgxaK5h8rjShPgOLJNLDmMwGOp2PHG8yncy/45DrWM8qTWmdCrCyd4hklG8Si7BNFsahOR758VHdWXTg86jTZJF+2yDDPPBymbE24uhcq3WBvtJCovhn84JKvUeq6dvhZHPci2PvZ6P78Hhpvu28iY/Hm3ZkR9t6f9SA86/4MoYgLdsc6i4x1thvx//x01Vlvg4yjpJNh4f+7C/n88r33Bv3xl6/yB9ZVAaJRW7Zbqlnj2hw5luk700lgu26/q2nmzMlPVuoK0bV917G9/rtusckVCmmofh/82M5vvxOEb9o/7tuuiWOvK18PyQwu7yAPGN+D/n+D//y9a7z/8vc/2vW/W41LWRNvb6XKfj9VgWbGZznjyjuNk1C2oQOqWgRev/WqKQDCFIlUCemEJYTcZKkO9LoL5j1DVqS9Bz1w1gU4nw3KYv4OGJJPv1uzCfrrUjzP9/r5S5y9vpYYr7FDy/M9oW33oaJi5Z0gDxc97EK5tgzRH/Xe+S/t8zft3tn7du9c/xHUN6IOvFqefa9+8YLKMqqnIKwzmk6vBIIs2jsP1HskxyZeuU0e1QncbfHgMZtbDad7dWuNI2Bs/1UXTG/fvpE9LmX7Y2SC6hEKly8Miq0/eZD9f6pepcA98p2EbBKdeikBQhyDGxTdCEKyXBbEOV1KiXx5GfKijac6XaoB1fRAQlDIzvoC4c4mxPFCgB4lV85/iTBiaxjnC+2tAF6UxXO/X3mo5EsKF4RwQBXSi38CakDogkkMAcKgBzYIZxy+VFIVD1mBEQGdrTMek28YGBT0wAv9GfW47tVphvN3p4cu+TTWB9d984np+/bEsq1gPhu6pmU3AcTdz3xeJH7LcfsKY4cpF/9J9NyOO+/fp5AiEqNIb7gVar2KEcXhRr5p2+N4r78+uAAiWbSuIdsjitYbEoPu+du3pyjVJpsz/8OHWS7khw/K14xZGN2EK2iMEBPR3dN/fQk+fnweRxxyDnEMY2OermgYw0fz270DzfAmZDfyKWkcouSuOFHsRoxMMS/PGvWMoLwm+L9gJLISrWEjxxuYFM9bDQMTY5GI4/IjGVb5PYd5nXJ11zEnIxAmT7xG+gsCr/pAwPTNk/Q731S3RDuXLDwSMfmuhWVpSiiHMVjcgZuQh+rlB/sJfENJIkkWMN/6+OW+7x/iif3NyB84gRgvDVEqNiFHkYEJR8s7govdPsKAcZI+f3YeP/vzi7dPRQjsXSR4nz3fHg/80eHd2DMWUB77v2B/cLn3161S8fT8z+rdmq7eoAL1hLysqm1xVgAK5oCIYAwjjggG0RpGNyAiMfygg9Y+/jhyWQdxXPtSfdeYrLsaEjVfFYTH/lsQTVOGORBM0/5mTy/+JwAA//9dgNZDhjIAAA== - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line312.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line314.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line312.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line314.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 6e00ee8f53e..28af5a8730d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line311.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line311.sh rename to pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index e43fc0eb157..21f8de45bf3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line311.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line311.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index e43fc0eb157..21f8de45bf3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line311.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line311.sh rename to pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index d9dc6a4329e..4ae0747b30c 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line319.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line321.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line319.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line321.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 94b34b70a95..d1fadf0493d 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line319.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line321.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line319.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line321.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index a24ef4a9199..fd7aaad241e 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line311.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line311.sh rename to pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index e43fc0eb157..21f8de45bf3 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line126.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line127.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line126.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line127.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line133.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line134.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line133.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line134.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line140.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line141.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line140.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line141.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line147.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line149.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line147.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line149.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line154.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line156.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line154.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line156.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line161.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line163.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line161.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line163.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line168.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line170.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line168.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line170.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line213.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line215.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line213.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line215.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line220.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line222.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line220.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line222.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line311.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line313.sh similarity index 100% rename from pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line311.sh rename to pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line313.sh diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh +++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index bf96099d390..ee1eebb5677 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line125.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line132.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line138.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line139.sh similarity index 63% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line138.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line139.sh index 2f855de5428..f73ba22284e 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line138.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line139.sh @@ -1,5 +1,5 @@ [Unit] -Description=Runs snapshot update script periodically +Description=Runs package update script periodically [Timer] OnBootSec=10min diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line145.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line146.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line145.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line146.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line152.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line153.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line152.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line153.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line159.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line160.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line159.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line160.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line166.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line167.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line166.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line167.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line211.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line212.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line211.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line212.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line218.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line219.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line218.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line219.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line310.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line310.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line310.sh rename to pkg/agent/testdata/AzureLinuxV2+Kata/line310.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh +++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index bf96099d390..ee1eebb5677 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line125.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line132.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line138.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line139.sh similarity index 63% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line138.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line139.sh index 2f855de5428..f73ba22284e 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line138.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line139.sh @@ -1,5 +1,5 @@ [Unit] -Description=Runs snapshot update script periodically +Description=Runs package update script periodically [Timer] OnBootSec=10min diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line145.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line146.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line145.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line146.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line152.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line153.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line152.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line153.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line159.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line160.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line159.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line160.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line166.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line167.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line166.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line167.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line211.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line212.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line211.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line212.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line218.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line219.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line218.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line219.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line309.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line310.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line309.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line310.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index bf96099d390..ee1eebb5677 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line125.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line132.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/CustomizedImage/line135.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line139.sh similarity index 63% rename from pkg/agent/testdata/CustomizedImage/line135.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line139.sh index 2f855de5428..f73ba22284e 100644 --- a/pkg/agent/testdata/CustomizedImage/line135.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line139.sh @@ -1,5 +1,5 @@ [Unit] -Description=Runs snapshot update script periodically +Description=Runs package update script periodically [Timer] OnBootSec=10min diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line145.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line146.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line145.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line146.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line152.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line153.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line152.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line153.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line159.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line160.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line159.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line160.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line166.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line167.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line166.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line167.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line211.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line212.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line211.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line212.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line218.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line219.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line218.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line219.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line309.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line310.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line309.sh rename to pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line310.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index bf96099d390..ee1eebb5677 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line125.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line132.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line139.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line145.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line146.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line145.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line146.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line152.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line153.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line152.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line153.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line159.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line160.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line159.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line160.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line166.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line167.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line166.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line167.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line211.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line212.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line211.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line212.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line218.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line219.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line218.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line219.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line309.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line310.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line309.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line310.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index bf96099d390..ee1eebb5677 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8RWTW/jNhC981dMVGEdFysp6aJF64VyaLGn7q0pCtRKBVoaSWxkUkuOnO16/d8LkrL8pQS5FL0EVObN15vHob+5Snqjk5WQCcoNrLhpGDNIECmQqpcGyX8iY0b1ukBIVEcJ/9JrTAoliQuJ2iSdVhthhJK5h+WlMKRVbOP1khOhLLHM+67WvMTrOWwZgEbSAk16e8MAKqVBgJAQXhv8BLcQDub5eygVAwA4BIqGQBBt4M0bWGnkjw4iKlhCKCDCT2MAeHgP1KB0AJe11xJu3Se2BsG0iB187/5RCQZQKokMAItGwYfPWPSE5VF22GcPBZBYo2E7xoqqzhtuctWRUHLo0MZrMQ19Mm9Kw+/cVyskprbZEiIJQfJX6O2LBLoAgtB6BnMHXTpEaD0CeNhnM0ivz7bhbY9p+G7P0hWcFrxPCMFQRnBC2kDG3riA0AUM4O5u7znyObq41gTMTDIbo84W8bfh4XsMNEvq2UmkStg+f/395w+/3H9MA6fTVhW8dWp97FdYUAtR5E5KVqKGZMN10oqVs7ZIycEW7PWbt8JQ3nFq0gSpSHhHibeY2JpOYCtePPbdC+jYI1jRqr7MLaMHrPuf/xsXVc3YUyNahCVcQVS9VKvV66B4R/rsDy5IyNpdkfuPv8FKKTKkedcJWc8c0Ev4HXPKZVKVmEu+tvpqlCF7nDN3N6IvEITbEbALTm6HH3LBpVQENRJYIFjgMN7PguCWVYKxWrUlytzpn/i6S8PrcJjWwfM4k90pfxslHUPBNl4j8ZITj102btVgljNLg5ZIaLLYbZksLtQ6acUGo45T0QhZRz53NOaePeyCk/7Oi5ts04NgBIEwYPs2SG/BPIoObFbYZz1i4MYy8GyQBUwVwFjRa42S/h/KhuTTnNnbv70ob1obHnXR8IQ3Gzfy8pmZpOmziR8m18/ANpclTBViXcDwNb61g7R9Ayk/wOAQyU9w2DFWyqot86Nrn4bXBScIt+cbYzdnh5XWEHWLLMn8WxhzXTRig3G/6iX1dgBZ4s9Z4rDGgY3knWkUTeJmkyy5zThRzFktr4ifXS9vop8esu2P2e5+OP6Q7f7M5v9RhcMTxDvKO40G9QYHoo2DDYDcP06kezx72KywTlbrDsKtNx1O3n3HmMSn185xVOXZ7HcBXDlRnsU6l+T+NTz1DuDuLN3RC7I7cpx8TKyA+67khOXCy7UUVfVCwKnW4OtXcERaYbt33rJfI+U+9EUPp2aouGixPN/2LtDl77iLYJeQZwKycfENqwwhitQG9ZMWhBOb8LDk/I57zYpLJ8TK/N7eq3wgHAq17lq0P/NMXxRoTNW37T/s3wAAAP//4jYo0yALAAA= + H4sIAAAAAAAA/8RTwW7TQBC971dMTaSkoo5TcaPyBcSJ3ijikEbRxh7bS9czq91xCq3672jtNEkbF3EjJzvzxu/NezPvzrIu+GxjKEPawkaHRqmAAikDcUcBZXhFpQJ3vkDI2EmmHzqPWcEk2hD6kDnPWxMM03qArUsTxPM8fu/r909fPt9c50nPZbnQtme86zZYiIU07Z+YKlNDttU+s2bTVy1KdqglSlG+UPeNsQhLOIO0+hscVldQsgIAwKJhmP7QRgzVULGHm+tvsGGWIF47Z6ie9kBTwXIJE4LUClwuFrBaXYE0SH01/iifzGb0/vL8fP9XsIgOPgxMNuC+0NMmYlrkTuD+iP5IpTBsEJzHgCTJofeXEbjsXyujSiZUirjENekW88ms4SDx8VxFzZA+QDJ53AOeEjgWPggpNBEL1CgQgRCBA+GOrDJK1WxLpHUUHUS3Lp/MJrsAD53HTHFVfgYmp6XJk8d5i6JLLXres2kxTGE5jQN7QsFwO++X53ZecJtZs8XUaSkaQ3U6cKd77unqKXkx32txo2MOINiDwASIcweUCwh3xkFkhWfWIwcW0YE3P/IRxgQoVXTeI8n/sWxHPu4ZRc9O5I3vxoA6GXikWx1dyngmef4m8etzeuG2phLGhMQWCLrFixhknDteTe/Bq4NZPB9MXGVTwRmUVK07V2rBk5kPJai0sVieHMM+xl0wCGnKW/T33giO5HqIbEjsXwLLRyxUuy10urjTNcJOZcGtsyhYQuiKAkOoOmt/J+pPAAAA///wIINjxgUAAA== - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line124.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line124.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line124.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line125.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line131.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line131.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line131.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line132.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line139.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line145.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line146.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line145.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line146.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line152.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line153.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line152.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line153.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line159.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line160.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line159.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line160.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line166.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line167.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line166.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line167.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line211.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line212.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line211.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line212.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line218.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line219.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line218.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line219.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line309.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line310.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line309.sh rename to pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line310.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 69e107d2747..47e1aba65d8 100644 --- a/pkg/agent/testdata/CustomizedImage/CustomData +++ b/pkg/agent/testdata/CustomizedImage/CustomData @@ -25,7 +25,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -113,6 +113,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -134,6 +135,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/CustomizedImage/line121.sh b/pkg/agent/testdata/CustomizedImage/line121.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/CustomizedImage/line121.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line124.sh b/pkg/agent/testdata/CustomizedImage/line122.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line124.sh rename to pkg/agent/testdata/CustomizedImage/line122.sh diff --git a/pkg/agent/testdata/CustomizedImage/line128.sh b/pkg/agent/testdata/CustomizedImage/line128.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/CustomizedImage/line128.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line131.sh b/pkg/agent/testdata/CustomizedImage/line129.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line131.sh rename to pkg/agent/testdata/CustomizedImage/line129.sh diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line138.sh b/pkg/agent/testdata/CustomizedImage/line136.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxV2+Kata/line138.sh rename to pkg/agent/testdata/CustomizedImage/line136.sh diff --git a/pkg/agent/testdata/CustomizedImage/line142.sh b/pkg/agent/testdata/CustomizedImage/line144.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line142.sh rename to pkg/agent/testdata/CustomizedImage/line144.sh diff --git a/pkg/agent/testdata/CustomizedImage/line149.sh b/pkg/agent/testdata/CustomizedImage/line151.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line149.sh rename to pkg/agent/testdata/CustomizedImage/line151.sh diff --git a/pkg/agent/testdata/CustomizedImage/line156.sh b/pkg/agent/testdata/CustomizedImage/line158.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line156.sh rename to pkg/agent/testdata/CustomizedImage/line158.sh diff --git a/pkg/agent/testdata/CustomizedImage/line163.sh b/pkg/agent/testdata/CustomizedImage/line165.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line163.sh rename to pkg/agent/testdata/CustomizedImage/line165.sh diff --git a/pkg/agent/testdata/CustomizedImage/line208.sh b/pkg/agent/testdata/CustomizedImage/line210.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line208.sh rename to pkg/agent/testdata/CustomizedImage/line210.sh diff --git a/pkg/agent/testdata/CustomizedImage/line215.sh b/pkg/agent/testdata/CustomizedImage/line217.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line215.sh rename to pkg/agent/testdata/CustomizedImage/line217.sh diff --git a/pkg/agent/testdata/CustomizedImage/line28.sh b/pkg/agent/testdata/CustomizedImage/line28.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/CustomizedImage/line28.sh +++ b/pkg/agent/testdata/CustomizedImage/line28.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line309.sh b/pkg/agent/testdata/CustomizedImage/line308.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line309.sh rename to pkg/agent/testdata/CustomizedImage/line308.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 69e107d2747..47e1aba65d8 100644 --- a/pkg/agent/testdata/CustomizedImageKata/CustomData +++ b/pkg/agent/testdata/CustomizedImageKata/CustomData @@ -25,7 +25,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -113,6 +113,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -134,6 +135,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/CustomizedImageKata/line121.sh b/pkg/agent/testdata/CustomizedImageKata/line121.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/CustomizedImageKata/line121.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line124.sh b/pkg/agent/testdata/CustomizedImageKata/line122.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line124.sh rename to pkg/agent/testdata/CustomizedImageKata/line122.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line128.sh b/pkg/agent/testdata/CustomizedImageKata/line128.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/CustomizedImageKata/line128.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line131.sh b/pkg/agent/testdata/CustomizedImageKata/line129.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line131.sh rename to pkg/agent/testdata/CustomizedImageKata/line129.sh diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line138.sh b/pkg/agent/testdata/CustomizedImageKata/line136.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line138.sh rename to pkg/agent/testdata/CustomizedImageKata/line136.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line142.sh b/pkg/agent/testdata/CustomizedImageKata/line144.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line142.sh rename to pkg/agent/testdata/CustomizedImageKata/line144.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line149.sh b/pkg/agent/testdata/CustomizedImageKata/line151.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line149.sh rename to pkg/agent/testdata/CustomizedImageKata/line151.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line156.sh b/pkg/agent/testdata/CustomizedImageKata/line158.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line156.sh rename to pkg/agent/testdata/CustomizedImageKata/line158.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line163.sh b/pkg/agent/testdata/CustomizedImageKata/line165.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line163.sh rename to pkg/agent/testdata/CustomizedImageKata/line165.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line208.sh b/pkg/agent/testdata/CustomizedImageKata/line210.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line208.sh rename to pkg/agent/testdata/CustomizedImageKata/line210.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line215.sh b/pkg/agent/testdata/CustomizedImageKata/line217.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line215.sh rename to pkg/agent/testdata/CustomizedImageKata/line217.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line28.sh b/pkg/agent/testdata/CustomizedImageKata/line28.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/CustomizedImageKata/line28.sh +++ b/pkg/agent/testdata/CustomizedImageKata/line28.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/CustomizedImage/line306.sh b/pkg/agent/testdata/CustomizedImageKata/line308.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImage/line306.sh rename to pkg/agent/testdata/CustomizedImageKata/line308.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index 2461d0ffe0e..b621d136370 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line124.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line124.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line124.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line125.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line131.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line131.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line131.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line132.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line139.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line145.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line146.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line145.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line146.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line152.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line153.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line152.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line153.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line159.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line160.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line159.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line160.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line166.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line167.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line166.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line167.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line211.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line212.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line211.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line212.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line218.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line219.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+CustomCloud/line218.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line219.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line311.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line311.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line311.sh rename to pkg/agent/testdata/MarinerV2+CustomCloud/line311.sh diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh +++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index ecc369abdfe..308c091cc8d 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/CustomData +++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line124.sh b/pkg/agent/testdata/MarinerV2+Kata/line124.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/MarinerV2+Kata/line124.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/MarinerV2+Kata/line125.sh b/pkg/agent/testdata/MarinerV2+Kata/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+Kata/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/MarinerV2+Kata/line131.sh b/pkg/agent/testdata/MarinerV2+Kata/line131.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/MarinerV2+Kata/line131.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+Kata/line132.sh b/pkg/agent/testdata/MarinerV2+Kata/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+Kata/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+Kata/line138.sh b/pkg/agent/testdata/MarinerV2+Kata/line138.sh deleted file mode 100644 index 2f855de5428..00000000000 --- a/pkg/agent/testdata/MarinerV2+Kata/line138.sh +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Runs snapshot update script periodically - -[Timer] -OnBootSec=10min -OnUnitActiveSec=10min - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+Kata/line139.sh b/pkg/agent/testdata/MarinerV2+Kata/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/MarinerV2+Kata/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/MarinerV2+Kata/line145.sh b/pkg/agent/testdata/MarinerV2+Kata/line146.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line145.sh rename to pkg/agent/testdata/MarinerV2+Kata/line146.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/line152.sh b/pkg/agent/testdata/MarinerV2+Kata/line153.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line152.sh rename to pkg/agent/testdata/MarinerV2+Kata/line153.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/line159.sh b/pkg/agent/testdata/MarinerV2+Kata/line160.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line159.sh rename to pkg/agent/testdata/MarinerV2+Kata/line160.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/line166.sh b/pkg/agent/testdata/MarinerV2+Kata/line167.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line166.sh rename to pkg/agent/testdata/MarinerV2+Kata/line167.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/line211.sh b/pkg/agent/testdata/MarinerV2+Kata/line212.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line211.sh rename to pkg/agent/testdata/MarinerV2+Kata/line212.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/line218.sh b/pkg/agent/testdata/MarinerV2+Kata/line219.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line218.sh rename to pkg/agent/testdata/MarinerV2+Kata/line219.sh diff --git a/pkg/agent/testdata/CustomizedImageKata/line306.sh b/pkg/agent/testdata/MarinerV2+Kata/line310.sh similarity index 100% rename from pkg/agent/testdata/CustomizedImageKata/line306.sh rename to pkg/agent/testdata/MarinerV2+Kata/line310.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/line32.sh b/pkg/agent/testdata/MarinerV2+Kata/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/MarinerV2+Kata/line32.sh +++ b/pkg/agent/testdata/MarinerV2+Kata/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index ecc369abdfe..308c091cc8d 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line124.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line124.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line124.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line125.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line131.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line131.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line131.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line132.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line138.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line138.sh deleted file mode 100644 index 2f855de5428..00000000000 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line138.sh +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Runs snapshot update script periodically - -[Timer] -OnBootSec=10min -OnUnitActiveSec=10min - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line139.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line145.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line146.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line145.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line146.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line152.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line153.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line152.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line153.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line159.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line160.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line159.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line160.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line166.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line167.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line166.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line167.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line211.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line212.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line211.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line212.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line218.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line219.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line218.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line219.sh diff --git a/pkg/agent/testdata/MarinerV2+Kata/line309.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line310.sh similarity index 100% rename from pkg/agent/testdata/MarinerV2+Kata/line309.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line310.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index ecc369abdfe..308c091cc8d 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9Q7a3Pbtpbf+StQXk0evaUeTuI26VXuMCItc6zX8uFuts1yKBKSsKYABgAV+6be374DgKQomZJlb/fDaiaRCB4cnPc5OID/9kNnjnBnHrGVZrtueOGM7PA30x9chr4ztqeB3z8HGoMcGLcaWoDfgbEAHZLxTvSvnMJOTDCPEIaUdTJKNoghgtsxWWcp5BB8+RXwFcQakB8YrwjQzZTCKLkDNMKAE8DyOIaMAXiLOMLLdrutl+C3iIOutkCaFmV8HdGb38wRwvmtuYSYgxVJE/BC00bTYWg5br+ziWgnJcuCsOiGaeubBFFgZKD1vYC611IMDAb2gOM0ZxxSY8tCSpbgj4KQx4CNmEGD5DzL+e68rZh+bP8XI7jpTZySPDEQRtxYoBSydhZtYNIEuVkJOMajNN1KuITbctjRtOyOrwh+85ieQgqTKOahJCGMCV6gZTu7K3AahiJNjRtZxFeFJNBcUd2R1OC4ZKLAwG95hUJJRU2ukbgPr2nBp2DiB6Frj2zTs/utVymbhxSmMGIQGBQY7LU0v99B6/su7D3o94HeO2933+rgS93iWJ4QEGXcWArzvQNRzgmFa7KBIF5Rgu+0yipb/9zOYHeMw3XMU0Ah4xHlxUhicLSG7A7HiTRKNfFVEnH4+qfWqxVhHEdr+PonIGfFOeNkzWKKMv7xo1TFWtMWhAIEEAatVwx+BT3w5rzbff0rSIgkQHkYA3rr+8Czw0t7NLNdT3rlzPQv7/U9lwJgSWEGjIuv4OXfCmh7evHyCIIXL8CcwuhGYlig7bItBAz4VRL0YBXpi63mAKGkmDJYQbMUwgz0yhUSgqHGYAIMBPROjcxOoh8mVGMkpzE8ArAHYTme704fx+RMPN8cjQ4DFIgehRtMJxfOcIciZaJ667vleOankR16npC5sFBOc7hnoAli0TyFnncJ/vyzJuPa5K2l6RlFm4hDAJdUBMyMkts7ECWJfEIMvGx9n7nOtenboT10bc8LZ+703z+HpmWJp/uXdfq8y2kwsgoWAtcOL31/piYcpveU2eHAPIxAfJTX5xSKOTPBxMDcZT+YWYKJgRkObNf36oZaTbZ5bOMNogSvIeZSSkeYGwSePx0LjL4beP5hAiv8A+m9g2gAKUcLFAvBHyVSUKAIMLCgYRr4n6bBRFAxHpsT675RlgpWCe7adL19KOlamygFrS1MXR4UcnoXr5MQLcJFhNKcQvCuC3rgHWjtUwA+fnxyKjv7+KK3y3cN62QSXpjO6FfJe+EaHcjjDmFGEbq1Kmg71j34oQ/0dURFGtrjU1m4K4IzwkuwjrCRzGXANvJMRFiwSKMlEBmyqhBSsmQhJyHcQMwZ0M0rrz3w7LYK8eMIW3Mz5ySQ8y/SaHmBUqiDo6+Vu91mhHJR6LAVydMkZDcoC/EGJSgKE4o2kDLt4VhYJOd+61WDWkJMQsYjzkBP6KfXBaLmAkZ8e2SV1xqFvN/6Z2XaFHJdirHbKMCLCKUwEWVVAjmka4ShMDSFFCikoCCzWBbMIRArZzBRYt2qenLtWI4ZWq5zbbtlOKwZut76PpwF4WRq2feKqtKjhMkogMNiOuyEhxQbpzDCQTacBZYSjw4eDEnyDiEo461K5y5kJN3ARAfN44fxVFHCTNYIB0yY88MxTbu+tMLRdLjNRf1Hyrmqwm49mAoealvoOOYwAUuSJhADtI6WEGQUlniP+0khu0FZGTpi+lame+MS1UUwGlV50bX/LXBc2+ovIpH8qwqgMg7HC68vReDrA6Hlhsgm2QiYcPnrS0vogVMC5jmXnt4kBUw4WJAcJ3pDbSLAZX0ymfrhhYhS9VjZTLygrGbTraknzLJV1JhTL5yYY1uY9IsXQHDViEWwWFryCYZcqMeCGdNB7WErQyWZYU2vvyovFaJKYAZxAnGMICunRxwRrB+1/gKy0qubY1HQVhTsv1DGqLe+T2zb8kS8901nYrvWrueWgvnu2yN7NnX90J6I6mUPTIkFnCIXH6ZQROBkluZLhCsC98ZV2oE8zwYTx0KUPcr6BPJvhN7sod0Z1SquHS+8EsXCyPabODnKSEK+4ZREyRXNGU9FzC5HKiEnv0Vs7a3QmlXWJ1ZVsgs9eyDqFn/khZ+mU9/zXXM2cybDZ1PiwTin0B95nwjhjNMou8rnMIXcvoVxKZAnAEuiXVsQtxcHjuyLdE9up8pQKWx5OAuKvMT0xrRSxQ5pZ4/nlB+ellMgZjmF9ZSyP7Ib0wr9CAIt+9oZ2OFsFAydSehchMJP7GPxrsIydoYVf/W0qVg0FkCXdVSx7yy+O4plI4EbFEMjk3poM0jFY0PdKD5VB+TJCNu1CCs+HMLnIOn0usYaLUNhRRwu72Tu1MFH0EngpoPzNAX/+MdLsWXVfvfUpC9arbLv60JWwv59e/i5bwhkRokMiMyRQl0Tdiltq1/72cmZqHXjKC1olJ2uJnJBq76I4FazpxcV+0X+OGZGcsffbsKtA71qKNhYlBkmTpQfNIPvVNsP7czzTdeXdffDffdh6kj2KHGWKoIkdSRrJq5Mp7s+Ib1V5ogL85PrDMKxOTGHtnt8H7ibb8emK3JLLeE2WPNj4V2SfBHNKYrHEY6Woi47/O4p+i2ksZDz1yXuxzS7B/5Qs7Ky9vZ1+kDAB8LFnoT2orEsbMp3jzKoot4YLWcR5UgWE+DhWEne8faXbuPkcJDfKyus6eDKdkWV50wOZjcGOfj7reqZkPgGUsEHwsDIQcuzXeUfrjMZODNzFA5Gjj3xQ8eSrd+D7z174Nq+oMT8D5Fsy+aJaw8dz3c/h2KmsOKKBOP2lAKryJXiK+apiRPxSzY6Kms8DKJpMYURh2JgHGG0gIxbiG6ldml6ZTvDs013cBla07F5RHZ663sTfL0l+PFAp1gWV4ZqZBoMRjReGQlZRwgfaA40LeQpw5YdmuPp6EZJpZ6BHt+CXf3Capuvq1+OVIHb5s7Eqc0ZTJxa1Te7Pg+twBwJpxxcHatlT6grrMvBbHNeepJ62in3jpfWJ6+zrSrLtbYjYLureIRY6VkVsfJpd7c/tj3PHNrh9CL0L+3QMj8XBVdjM+IA/J9gHjF4/hYYiTA8YQdrwpPdlXzTHdp+OBhNg1ImprDOwQrhaJCSPNlbkkIeLccDV21WLwiVkLtIi9rtcur5Xtm8NYf25Eg/8LgpzVRHdqC6aJeE8coWG17tKH6nRRn6rjnxZqYrwtJlMLTDmTm0n2wLlUX7NMIsiyjE/DJfwlm0hDV7b3h7hDTvN3MmY8XzyfG+RZnqvT0YanKGoTsNZtdnB9c7WIk+iB+i+IyXlOTZ5qyx8BRV3oGy8yr4ZI+ECUpywouROfT6RoHOUNmsXxCgy3LxWX5dRUTJUBV7kx0/ErRMbD/07fFsZPp2sxdtJ0tJYMhDDtdZGnEomdeeI70KpyHWMxZptHx6CV/JspJHJU+qeg0GhV9zyLg8YiM57/ferYGxXb6CgzjJCMK8n2N0+6HT6dAc1znf/mwzEt+A7QpKc6xf8NtmKYrhDnyxk6pq/7II+wEwuN5AOiBr4TZAKcSd2L7thaKAc6aTD4bebXfbXf0e6L322c/trr5Xnj1T8BX9f5HoQzeY+M7YlhroN4i4T+Ga8JoYinqvXoCUWC3Huwr9z7PDweFpXM8RTtYkx/ywtwYY8S+aC7/miELWFzMMNaXApJkLDmnTi9JJj6dB747FPC3ToHo61bHFBr4piNYMPxg5Y8f3Dgjs4A4O8m1GD1K0Rrxe9jx4dwKfRQ1aMlo81hpRniiKJ9PQCmaiOJ6OHW8QTAMv/OQ61jPSk1pnQqw8m+IZJWvE4vwTRYnITkdentKdPWH5fJ5jnns4ytiKcHXsU2l5Z7RcsLnX++AM7xSiqmh+liS9GPZ+Nro/v4fG2+6b2Ji/eXdmRL33Zz0Iz7o/QyjMnt2xzjxnnc1a/F9snjqrTZhzlHZyLMx7e95enK333qA//vJV/sC6yi80bstuSj0oXJsjxzJ9ZzoJbdftdzXNnDnFxkmdELq27zq213/XLXVYg5CC6vfBj+3icDtF+Kb9467sDmHsdeXlIBmg5RHjHuJ70P9v8J+/d433X/7+R7v5u3VwKWvi7axU0/dTGTiM+KxAXLuG8WileqDBqToAXr/16pADRBkSkRDSCUsJuckzHehN58c7gqxRew964KwLcDEbVLn6HTAknn63QQn664o8z/f6xUWbnbaVGG+QQ8vzPcFt9yGjYuUtIQ8X3W8yubZ00R/13vkv7fM37d7Z+3bvXP8RNPeZ9qxabm2vfvHC2jKqZSCkM5pOr0SBWHZvHrB3IsZDuAqZnNTo26p4cIpy6+50rw6lcQyMzb+anOnt2zeyhaVkfwxMQJ3AcHWBoFT9o/vU/6fs1fLXidcgZA/osYsQIMIJuEHxjQAki0UJXMBllMiLlREvu3SqkaX6S4fuPwgI2TifI9xZRziZi5pG0VXgXyCM2AomxUI7K4AXVfLcbUfuM/mSwjkhHFBVyCU/ATUgeMEkgQBh0ANrhHMOXyqqynuqwIiBzlY5T8g3DAwKeuCF/ox83HSpNMfFtdJ9k3wa6r3TvGBi+r49sWwrDGZD17TsQ/Xf9hMEZeC3HLevSugo4+KfLI7bSef9+wxSRBIU6wcOfVqvEkRxtJZX1nYw3uuv9853SB6vGsB2gOLVmiSge/727WOQSsnmzP/wYVYQ+eGDsjVjFsU30RIaI8SEd/f0X1+Cjx+fhxFHnEOcwMQIsiWNEngyvu01zxyvI3Yjb4omEUrvyg3DdsTIFfJqK9GMCMpTgP8LRCIq0QY0cvwAkvL2qmFgYsxTsRs+EWEd33OQNzHXdNryqAfC9ImnRH+B49XP/03ffBR+a5vqEGhrkqVFIiavrbA8ywjlMAHzO3AT8Uhd7GA/gW8oTSXIHBaqT17u2v5+PbGrjOL+EkjwwhCpYh1xFBuYcLS4I7jU9hEEjJPs+bML/9mdX15tKl1g55zA++z59njgj/aPvp6xgLLY/wX6vbO7v26VmqUXP+tHZ7q6YgrUDfEqq7bFXgGoMkds8DGMOSIYxCsY34CYJPCDDlq79ceRsziIk8aL6Nu+Y9PJj8j5KiGc+qcemqYEs0eYpv3Nnl78TwAAAP//tXl5uWUyAAA= + H4sIAAAAAAAA/9Rbe3fbtpL/n58C5dXJo7fUw0ncJr3KPYxIyzzWa0nK3Wyb5aFISMKaAhgAVOybej/7HgAkRcmkZHu7f6zPaW1Bg8HMYB4/DJC//dBZINxZhGyt2a4bXDgjO/jN9AeXge+M7enc758DjUEOjFsNLcHvwFiCDkl5J/xXRmEnIpiHCEPKOiklW8QQwe2IbNIEcgi+/Ar4GmINyB8YrQnQzYTCML4DNMSAE8CyKIKMAXiLOMKrdrutF+S3iIOutkSaFqZ8E9Kb38wRwtmtuYKYgzVJYvBC00bTYWA5br+zDWknIatcsPCGaZubGFFgpKD1Pae61xIMDAYOiKMkYxxSY6dCQlbgj1yQU8RGxKBBMp5mfH/ezkw/tv+LEVz3TZSQLDYQRtxYogSydhpuYVxHuV0LOsbDJNlZuKDbadjRtPSOrwl+c2qfAgrjMOKBFCGICF6iVTu9y3kahhJNjRtpyNe5JdBCSd2R0uCoUCLnwG95yUJZRU2uiHhIr2nzT/OJPw9ce2Sbnt1vvUrYIqAwgSGDwKDAYK+l+/0OWt/3ae9Bvw/03nm7+1YHX6oex7KYgDDlxkq47x0IM04o3JAtBNGaEnynlV7Z+uduBrtjHG4ingAKGQ8pz0dig6MNZHc4iqVTqomv4pDD1z+1Xq0J4zjcwNc/ATkryhgnGxZRlPKPH+VWbDRtSShAAGHQesXgV9ADb8673de/gphIAVSEMaC3vg88O7i0RzPb9WRUzkz/8l4/CCkAVhSmwLj4Cl7+Lae2pxcvjzB48QIsKAxvJIcl2i3bQsCAX6VAD1aRsdiqTxDKigmDJTVLIExBr1ghJhhqDMbAQEDvVMTsxHqzoBojGY3gEYIDCsvxfHd6mpMz8XxzNGomyBmdpBtMJxfOcE8i5aJ667vleOankR14nrC58FBOM3jgoDFi4SKBnncJ/vyzYuPK5J2n6SlF25BDAFdUJMyUkts7EMax/IQYeNn6PnOda9O3A3vo2p4XzNzpv38OTMsSn+5fVuXzLqfzkZWrMHft4NL3Z2pCs7yPmR0MzGYG4kdFfUahmDMTSgzMffXnM0soMTCDge36XtVRy8k2j2y8RZTgDcRcWumIcoO550/HgqPvzj2/WcCS/0BG7yAcQMrREkXC8EeFFBIoAQwsZJjO/U/T+URIMR6bE+u+1paKVhnu2nS9QyoZWtswAa0dTdUeFHJ6F23iAC2DZYiSjELwrgt64B1oHUoAPn58cik7+/iit693hetkElyYzuhXqXseGh3Iow5hRp66tTJpO9Y9+KEP9E1IRRk60FN5uCuSM8IrsAmxES9kwjayVGRYsEzCFRAVskQICVmxgJMAbiHmDOjmldceeHZbpfhxiK2FmXEyl/MvknB1gRKog6Nfq3C7TQnlAuiwNcmSOGA3KA3wFsUoDGKKtpAy7eFYkBfnfutVzbYEmASMh5yBntifXhcIzAWM6PbIKq81Cnm/9c/StSnkujRjt9aAFyFKYCxgVQw5pBuEoXA0xRQopiAXM18WLCAQK6cwVmbdbfXk2rEcM7Bc59p2i3RYcXS99X04mweTqWXfK6mKiBIuowiazdQchE0bGyUwxPN0OJtbyjw6eDAkxWtiUORbVc5dyEiyhbEO6seb+ZRZwow3CM+ZcOeHY5p2fWkFo+lwV4v6J+BcibBbD6aCh7st9jjiMAYrksQQA7QJVxCkFBZ8j8dJbrtBgQwdMX1n04NxyepiPhqVddG1/23uuLbVX4ai+JcIoHQOxwuuL0Xi6wOxyzWZTaoxZyLkry8tsQ+cErDIuIz0OitgwsGSZDjWa7CJIJf4ZDL1gwuRpaq5sl54IVnFp1tTT7hlK8eYUy+YmGNbuPSLF0BoVctFqFh48iMcOd8eC6ZMB5UPOxsqywwr+/qrilJhqhimEMcQRwiyYnrIEcH6Ue/PKct9dTMsAG0pweEXyhn11veJbVueyPe+6Uxs19qP3MIw3317ZM+mrh/YE4FeDsiUWcBj7OLDBIoMHM+SbIVwKeDBuCo7kGfpYOJYiLKTqk8g/0bozQHbvVGt1NrxgisBFka2X6fJUUVi8g0nJIyvaMZ4InJ2MVIaOf4tZBtvjTas9D6xqrJd4NkDgVv8kRd8mk59z3fN2cyZDJ8tiQejjEJ/5H0ihDNOw/QqW8AEcvsWRoVBnkAshXZtIdxBHjhyLtI9eZwqUqXw5eFsntclpteWlTJ3SD87XVN+eFpNgZhlFFZLyuHIfk7L90cIaNnXzsAOZqP50JkEzkUg4sQ+lu9KLmNnWOpXLZtKRWMJdImj8nNn/rujVDZiuEURNFK5D20GqfhYgxvFT9kBeTLDdiXDih8O4XOYdHpdY4NWgfAiDld3snbq4CPoxHDbwVmSgH/846U4smq/e2rSF62C7Pu6sJXwf98efu4bgplRMAOiciRQ14RfSt/qV/7sZExg3ShMchllp6tOXNCqLiK01ezpRal+Xj+OuZE88bfreOtALxsKNhYww8SxioN68j20/dDPPN90fYm7H567m6Uj6UnhLAWCpHQkrReuKKf7MSGjVdaIC/OT6wyCsTkxh7Z7/By4X2/HpitqS6Xg1njzqfQuRb4IFxRF4xCHK4HLmr97yv7m1ljK+ZuC96mdPSB/uLMSWXuHe/rAwA3p4sBCB9lYApviu5MKqqw3RqtZSDmSYAI8HCvEO97+0m0cNyf5A1hhTQdXtitQnjNprG4McvD3W9UzIdENpEIPhIGRgZZnuyo+XGcycGbmKBiMHHviB44lW7+N33v2wLV9IYn5H6LYFs0T1x46nu9+DsRM4cWlCMbtYwBWXivFr4gnJo7FX7LRUXpjM4mmRRSGHIqBcYjREjJuIbqz2qXpFe0MzzbdwWVgTcfmEdvpre919NWW4MeGTrEEV4ZqZBoMhjRaGzHZhAg3NAfqFvKUY8sOzfFydKOsUq1Ap49gV7+wyuHr6pcjKHDX3Jk4lTmDiVNBfbPr88CamyMRlIOrY1j2EbjCuhzMtudFJKlPe3DvOLR+9Do7VFmstRsBu1PFCWFlZJXCyk/7p/2x7Xnm0A6mF4F/aQeW+TkHXLXNiAb6P8EiZPD8LTBi4XjCDzaEx/sr+aY7tP1gMJrOC5uYwjsHa4TDQUKy+GBJCnm4Gg9cdVi9IFRS7jPNsdvl1PO9onlrDu3JkX7gcVeaqY7sQHXRLgnjpS/WfLW38XstysB3zYk3M12Rli7nQzuYmUP7yb5QerRPQ8zSkELML7MVnIUrWPH3mm+PiOb9Zs5krni+ON63MFW9twdDdcEwdKfz2fVZ43qNSPRB/hDgM1pRkqXbs1rgKVBeA+y8mn+yR8IFpTjBxcgcen0jZ2eoatbPBdAlXHxWXJcZUSpU5t54L46ELBPbD3x7PBuZvl0fRbvJ0hIY8oDDTZqEHErltedYr+RpiPWMZRKung7hS1uW9ijtSVWvwaDwawYZl1dsJOP93rsNMHbLl3QQxylBmPczjG4/dDodmuGq5rs/24xEN2C3gto51s/1bbMERXCPPj9Jldi/AGE/AAY3W0gHZCPCBqgNcSe2b3uBAHDOdPLB0Lvtbrur3wO91z77ud3VD+DZMw1fyv8XmT5w5xPfGdtyB/o1Ju5TuCG8YoYc71UBSMHVcryrwP88a04OT9N6gXC8IRnmzdE6x4h/0Vz4NUMUsr6YYagpOSfNXHJI674ogvR4GfTuWMSTogyqT48NbHGAr0uiFcefj5yx43sNBms8wUG+q+jzBG0Qr8KeB989Qs8cgxaK5h8rjShPgOLJNLDmMwGOp2PHG8yncy/45DrWM8qTWmdCrCyd4hklG8Si7BNFsahOR758VHdWXTg86jTZJF+2yDDPPBymbE24uhcq3WBvtJCovhn84JKvUeq6dvhZHPci2PvZ6P78Hhpvu28iY/Hm3ZkR9t6f9SA86/4MoYgLdsc6i4x1thvx//x01Vlvg4yjpJNh4f+7C/n88r33Bv3xl6/yB9ZVAaJRW7Zbqlnj2hw5luk700lgu26/q2nmzMlPVuoK0bV917G9/rtusckVCmmofh/82M5vvxOEb9o/7tuuiWOvK18PyQwu7yAPGN+D/n+D//y9a7z/8vc/2vW/W41LWRNvb6XKfj9VgWbGZznjyjuNk1C2oQOqWgRev/WqKQDCFIlUCemEJYTcZKkO9LoL5j1DVqS9Bz1w1gU4nw3KYv4OGJJPv1uzCfrrUjzP9/r5S5y9vpYYr7FDy/M9oW33oaJi5Z0gDxc97EK5tgzRH/Xe+S/t8zft3tn7du9c/xHUN6IOvFqefa9+8YLKMqqnIKwzmk6vBIIs2jsP1HskxyZeuU0e1QncbfHgMZtbDad7dWuNI2Bs/1UXTG/fvpE9LmX7Y2SC6hEKly8Miq0/eZD9f6pepcA98p2EbBKdeikBQhyDGxTdCEKyXBbEOV1KiXx5GfKijac6XaoB1fRAQlDIzvoC4c4mxPFCgB4lV85/iTBiaxjnC+2tAF6UxXO/X3mo5EsKF4RwQBXSi38CakDogkkMAcKgBzYIZxy+VFIVD1mBEQGdrTMek28YGBT0wAv9GfW47tVphvN3p4cu+TTWB9d984np+/bEsq1gPhu6pmU3AcTdz3xeJH7LcfsKY4cpF/9J9NyOO+/fp5AiEqNIb7gVar2KEcXhRr5p2+N4r78+uAAiWbSuIdsjitYbEoPu+du3pyjVJpsz/8OHWS7khw/K14xZGN2EK2iMEBPR3dN/fQk+fnweRxxyDnEMY2OermgYw0fz270DzfAmZDfyKWkcouSuOFHsRoxMMS/PGvWMoLwm+L9gJLISrWEjxxuYFM9bDQMTY5GI4/IjGVb5PYd5nXJ11zEnIxAmT7xG+gsCr/pAwPTNk/Q731S3RDuXLDwSMfmuhWVpSiiHMVjcgZuQh+rlB/sJfENJIkkWMN/6+OW+7x/iif3NyB84gRgvDVEqNiFHkYEJR8s7govdPsKAcZI+f3YeP/vzi7dPRQjsXSR4nz3fHg/80eHd2DMWUB77v2B/cLn3161S8fT8z+rdmq7eoAL1hLysqm1xVgAK5oCIYAwjjggG0RpGNyAiMfygg9Y+/jhyWQdxXPtSfdeYrLsaEjVfFYTH/lsQTVOGORBM0/5mTy/+JwAA//9dgNZDhjIAAA== - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line124.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line124.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line124.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line125.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line131.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line131.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line131.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line132.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line138.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line138.sh deleted file mode 100644 index 2f855de5428..00000000000 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line138.sh +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Runs snapshot update script periodically - -[Timer] -OnBootSec=10min -OnUnitActiveSec=10min - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line139.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line145.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line146.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line145.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line146.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line152.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line153.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line152.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line153.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line159.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line160.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line159.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line160.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line166.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line167.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line166.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line167.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line211.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line212.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line211.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line212.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line218.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line219.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line218.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line219.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line309.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line310.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line309.sh rename to pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line310.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index ecc369abdfe..308c091cc8d 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line124.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line124.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line124.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line125.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line131.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line131.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line131.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line132.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line138.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line138.sh deleted file mode 100644 index 2f855de5428..00000000000 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line138.sh +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Runs snapshot update script periodically - -[Timer] -OnBootSec=10min -OnUnitActiveSec=10min - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line139.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line145.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line146.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line145.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line146.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line152.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line153.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line152.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line153.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line159.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line160.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line159.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line160.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line166.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line167.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line166.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line167.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line211.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line212.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line211.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line212.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line218.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line219.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line218.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line219.sh diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line309.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line310.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line309.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line310.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index ecc369abdfe..308c091cc8d 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData @@ -29,7 +29,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -116,26 +116,27 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== -- path: /opt/azure/containers/ubuntu-snapshot-update.sh + +- path: /opt/azure/containers/mariner-package-update.sh permissions: "0544" encoding: gzip owner: root content: !!binary | - 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 - path: /etc/systemd/system/snapshot-update.service permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/yzMvQ3CQAxA4f6myALhJrgOJjhSRSnMYSlubMs/CJgeEaV7xdO3LkyxlSv6MNIg4dYZ1HeJadEnBE4d7UUDS1nP2sr9o9iE8b+V2xtHD7BoVTQqfNOwDuEAYjSv+UiOnP1k5zzYi++/AAAA//9JR72LfAAAAA== + H4sIAAAAAAAA/yzMvQ3CQAwG0P6myALhJkgHPVJIFaWwzCdiIWzL5yBgesRP96o3Tyq5lD0ah3iK6XAkvtIF3eRnSnQj4i6MUua/lnJ6OgZTtNWyHB7gMSlyqOZZ6bUFKpsmiSJavVF80Puv7bdvu2vrOwAA//8tZX1QewAAAA== - path: /etc/systemd/system/snapshot-update.timer permissions: "0644" encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + H4sIAAAAAAAA/0TMPQoCMRBA4X5OkQsoeoAtXGysFvzBIqQYkmEZTCZhMhH29iIWtu/B5x/CFuBMPSo34yrTdUh3DeMLV3KjJTRyv+saKdfEEXPeAPydC2mAReZa7UZxOh4KCyzyRU/R+E3/Cv4i3TDnAE8UozRvUxnZeDc66d5QV7JPAAAA//898E0ujwAAAA== - path: /opt/azure/containers/bind-mount.sh permissions: "0544" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line124.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line124.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line124.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line125.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line125.sh new file mode 100644 index 00000000000..3859ce5a6b7 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line125.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +set -o nounset +set -e + +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line131.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line131.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line131.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line132.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line132.sh new file mode 100644 index 00000000000..80e54eeb701 --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line132.sh @@ -0,0 +1,6 @@ +[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line138.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line138.sh deleted file mode 100644 index 2f855de5428..00000000000 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line138.sh +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Runs snapshot update script periodically - -[Timer] -OnBootSec=10min -OnUnitActiveSec=10min - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line139.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line139.sh new file mode 100644 index 00000000000..f73ba22284e --- /dev/null +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line139.sh @@ -0,0 +1,9 @@ +[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line145.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line146.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line145.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line146.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line152.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line153.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line152.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line153.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line159.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line160.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line159.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line160.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line166.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line167.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line166.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line167.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line211.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line212.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line211.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line212.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line218.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line219.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line218.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line219.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line309.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line310.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line309.sh rename to pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line310.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh +++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line32.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index a06afa3c461..caa5d178d42 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9Q7a3Pbtpbf+StQXk0evaUeTuI26VXuMCItc6zX8uFuts1yKBKSsKYABgAV+6be374DgKQomZJlb/fDaiaRCB4cnPc5OID/9kNnjnBnHrGVZrtueOGM7PA30x9chr4ztqeB3z8HGoMcGLcaWoDfgbEAHZLxTvSvnMJOTDCPEIaUdTJKNoghgtsxWWcp5BB8+RXwFcQakB8YrwjQzZTCKLkDNMKAE8DyOIaMAXiLOMLLdrutl+C3iIOutkCaFmV8HdGb38wRwvmtuYSYgxVJE/BC00bTYWg5br+ziWgnJcuCsOiGaeubBFFgZKD1vYC611IMDAb2gOM0ZxxSY8tCSpbgj4KQx4CNmEGD5DzL+e68rZh+bP8XI7jpTZySPDEQRtxYoBSydhZtYNIEuVkJOMajNN1KuITbctjRtOyOrwh+85ieQgqTKOahJCGMCV6gZTu7K3AahiJNjRtZxFeFJNBcUd2R1OC4ZKLAwG95hUJJRU2ukbgPr2nBp2DiB6Frj2zTs/utVymbhxSmMGIQGBQY7LU0v99B6/su7D3o94HeO2933+rgS93iWJ4QEGXcWArzvQNRzgmFa7KBIF5Rgu+0yipb/9zOYHeMw3XMU0Ah4xHlxUhicLSG7A7HiTRKNfFVEnH4+qfWqxVhHEdr+PonIGfFOeNkzWKKMv7xo1TFWtMWhAIEEAatVwx+BT3w5rzbff0rSIgkQHkYA3rr+8Czw0t7NLNdT3rlzPQv7/U9lwJgSWEGjIuv4OXfCmh7evHyCIIXL8CcwuhGYlig7bItBAz4VRL0YBXpi63mAKGkmDJYQbMUwgz0yhUSgqHGYAIMBPROjcxOoh8mVGMkpzE8ArAHYTme704fx+RMPN8cjQ4DFIgehRtMJxfOcIciZaJ667vleOankR16npC5sFBOc7hnoAli0TyFnncJ/vyzJuPa5K2l6RlFm4hDAJdUBMyMkts7ECWJfEIMvGx9n7nOtenboT10bc8LZ+703z+HpmWJp/uXdfq8y2kwsgoWAtcOL31/piYcpveU2eHAPIxAfJTX5xSKOTPBxMDcZT+YWYKJgRkObNf36oZaTbZ5bOMNogSvIeZSSkeYGwSePx0LjL4beP5hAiv8A+m9g2gAKUcLFAvBHyVSUKAIMLCgYRr4n6bBRFAxHpsT675RlgpWCe7adL19KOlamygFrS1MXR4UcnoXr5MQLcJFhNKcQvCuC3rgHWjtUwA+fnxyKjv7+KK3y3cN62QSXpjO6FfJe+EaHcjjDmFGEbq1Kmg71j34oQ/0dURFGtrjU1m4K4IzwkuwjrCRzGXANvJMRFiwSKMlEBmyqhBSsmQhJyHcQMwZ0M0rrz3w7LYK8eMIW3Mz5ySQ8y/SaHmBUqiDo6+Vu91mhHJR6LAVydMkZDcoC/EGJSgKE4o2kDLt4VhYJOd+61WDWkJMQsYjzkBP6KfXBaLmAkZ8e2SV1xqFvN/6Z2XaFHJdirHbKMCLCKUwEWVVAjmka4ShMDSFFCikoCCzWBbMIRArZzBRYt2qenLtWI4ZWq5zbbtlOKwZut76PpwF4WRq2feKqtKjhMkogMNiOuyEhxQbpzDCQTacBZYSjw4eDEnyDiEo461K5y5kJN3ARAfN44fxVFHCTNYIB0yY88MxTbu+tMLRdLjNRf1Hyrmqwm49mAoealvoOOYwAUuSJhADtI6WEGQUlniP+0khu0FZGTpi+lame+MS1UUwGlV50bX/LXBc2+ovIpH8qwqgMg7HC68vReDrA6Hlhsgm2QiYcPnrS0vogVMC5jmXnt4kBUw4WJAcJ3pDbSLAZX0ymfrhhYhS9VjZTLygrGbTraknzLJV1JhTL5yYY1uY9IsXQHDViEWwWFryCYZcqMeCGdNB7WErQyWZYU2vvyovFaJKYAZxAnGMICunRxwRrB+1/gKy0qubY1HQVhTsv1DGqLe+T2zb8kS8901nYrvWrueWgvnu2yN7NnX90J6I6mUPTIkFnCIXH6ZQROBkluZLhCsC98ZV2oE8zwYTx0KUPcr6BPJvhN7sod0Z1SquHS+8EsXCyPabODnKSEK+4ZREyRXNGU9FzC5HKiEnv0Vs7a3QmlXWJ1ZVsgs9eyDqFn/khZ+mU9/zXXM2cybDZ1PiwTin0B95nwjhjNMou8rnMIXcvoVxKZAnAEuiXVsQtxcHjuyLdE9up8pQKWx5OAuKvMT0xrRSxQ5pZ4/nlB+ellMgZjmF9ZSyP7Ib0wr9CAIt+9oZ2OFsFAydSehchMJP7GPxrsIydoYVf/W0qVg0FkCXdVSx7yy+O4plI4EbFEMjk3poM0jFY0PdKD5VB+TJCNu1CCs+HMLnIOn0usYaLUNhRRwu72Tu1MFH0EngpoPzNAX/+MdLsWXVfvfUpC9arbLv60JWwv59e/i5bwhkRokMiMyRQl0Tdiltq1/72cmZqHXjKC1olJ2uJnJBq76I4FazpxcV+0X+OGZGcsffbsKtA71qKNhYlBkmTpQfNIPvVNsP7czzTdeXdffDffdh6kj2KHGWKoIkdSRrJq5Mp7s+Ib1V5ogL85PrDMKxOTGHtnt8H7ibb8emK3JLLeE2WPNj4V2SfBHNKYrHEY6Woi47/O4p+i2ksZDz1yXuxzS7B/5Qs7Ky9vZ1+kDAB8LFnoT2orEsbMp3jzKoot4YLWcR5UgWE+DhWEne8faXbuPkcJDfKyus6eDKdkWV50wOZjcGOfj7reqZkPgGUsEHwsDIQcuzXeUfrjMZODNzFA5Gjj3xQ8eSrd+D7z174Nq+oMT8D5Fsy+aJaw8dz3c/h2KmsOKKBOP2lAKryJXiK+apiRPxSzY6Kms8DKJpMYURh2JgHGG0gIxbiG6ldml6ZTvDs013cBla07F5RHZ663sTfL0l+PFAp1gWV4ZqZBoMRjReGQlZRwgfaA40LeQpw5YdmuPp6EZJpZ6BHt+CXf3Capuvq1+OVIHb5s7Eqc0ZTJxa1Te7Pg+twBwJpxxcHatlT6grrMvBbHNeepJ62in3jpfWJ6+zrSrLtbYjYLureIRY6VkVsfJpd7c/tj3PHNrh9CL0L+3QMj8XBVdjM+IA/J9gHjF4/hYYiTA8YQdrwpPdlXzTHdp+OBhNg1ImprDOwQrhaJCSPNlbkkIeLccDV21WLwiVkLtIi9rtcur5Xtm8NYf25Eg/8LgpzVRHdqC6aJeE8coWG17tKH6nRRn6rjnxZqYrwtJlMLTDmTm0n2wLlUX7NMIsiyjE/DJfwlm0hDV7b3h7hDTvN3MmY8XzyfG+RZnqvT0YanKGoTsNZtdnB9c7WIk+iB+i+IyXlOTZ5qyx8BRV3oGy8yr4ZI+ECUpywouROfT6RoHOUNmsXxCgy3LxWX5dRUTJUBV7kx0/ErRMbD/07fFsZPp2sxdtJ0tJYMhDDtdZGnEomdeeI70KpyHWMxZptHx6CV/JspJHJU+qeg0GhV9zyLg8YiM57/ferYGxXb6CgzjJCMK8n2N0+6HT6dAc1znf/mwzEt+A7QpKc6xf8NtmKYrhDnyxk6pq/7II+wEwuN5AOiBr4TZAKcSd2L7thaKAc6aTD4bebXfbXf0e6L322c/trr5Xnj1T8BX9f5HoQzeY+M7YlhroN4i4T+Ga8JoYinqvXoCUWC3Huwr9z7PDweFpXM8RTtYkx/ywtwYY8S+aC7/miELWFzMMNaXApJkLDmnTi9JJj6dB747FPC3ToHo61bHFBr4piNYMPxg5Y8f3Dgjs4A4O8m1GD1K0Rrxe9jx4dwKfRQ1aMlo81hpRniiKJ9PQCmaiOJ6OHW8QTAMv/OQ61jPSk1pnQqw8m+IZJWvE4vwTRYnITkdentKdPWH5fJ5jnns4ytiKcHXsU2l5Z7RcsLnX++AM7xSiqmh+liS9GPZ+Nro/v4fG2+6b2Ji/eXdmRL33Zz0Iz7o/QyjMnt2xzjxnnc1a/F9snjqrTZhzlHZyLMx7e95enK333qA//vJV/sC6yi80bstuSj0oXJsjxzJ9ZzoJbdftdzXNnDnFxkmdELq27zq213/XLXVYg5CC6vfBj+3icDtF+Kb9467sDmHsdeXlIBmg5RHjHuJ70P9v8J+/d433X/7+R7v5u3VwKWvi7axU0/dTGTiM+KxAXLuG8WileqDBqToAXr/16pADRBkSkRDSCUsJuckzHehN58c7gqxRew964KwLcDEbVLn6HTAknn63QQn664o8z/f6xUWbnbaVGG+QQ8vzPcFt9yGjYuUtIQ8X3W8yubZ00R/13vkv7fM37d7Z+3bvXP8RNPeZ9qxabm2vfvHC2jKqZSCkM5pOr0SBWHZvHrB3IsZDuAqZnNTo26p4cIpy6+50rw6lcQyMzb+anOnt2zeyhaVkfwxMQJ3AcHWBoFT9o/vU/6fs1fLXidcgZA/osYsQIMIJuEHxjQAki0UJXMBllMiLlREvu3SqkaX6S4fuPwgI2TifI9xZRziZi5pG0VXgXyCM2AomxUI7K4AXVfLcbUfuM/mSwjkhHFBVyCU/ATUgeMEkgQBh0ANrhHMOXyqqynuqwIiBzlY5T8g3DAwKeuCF/ox83HSpNMfFtdJ9k3wa6r3TvGBi+r49sWwrDGZD17TsQ/Xf9hMEZeC3HLevSugo4+KfLI7bSef9+wxSRBIU6wcOfVqvEkRxtJZX1nYw3uuv9853SB6vGsB2gOLVmiSge/727WOQSsnmzP/wYVYQ+eGDsjVjFsU30RIaI8SEd/f0X1+Cjx+fhxFHnEOcwMQIsiWNEngyvu01zxyvI3Yjb4omEUrvyg3DdsTIFfJqK9GMCMpTgP8LRCIq0QY0cvwAkvL2qmFgYsxTsRs+EWEd33OQNzHXdNryqAfC9ImnRH+B49XP/03ffBR+a5vqEGhrkqVFIiavrbA8ywjlMAHzO3AT8Uhd7GA/gW8oTSXIHBaqT17u2v5+PbGrjOL+EkjwwhCpYh1xFBuYcLS4I7jU9hEEjJPs+bML/9mdX15tKl1g55zA++z59njgj/aPvp6xgLLY/wX6vbO7v26VmqUXP+tHZ7q6YgrUDfEqq7bFXgGoMkds8DGMOSIYxCsY34CYJPCDDlq79ceRsziIk8aL6Nu+Y9PJj8j5KiGc+qcemqYEs0eYpv3Nnl78TwAAAP//tXl5uWUyAAA= + H4sIAAAAAAAA/9Rbe3fbtpL/n58C5dXJo7fUw0ncJr3KPYxIyzzWa0nK3Wyb5aFISMKaAhgAVOybej/7HgAkRcmkZHu7f6zPaW1Bg8HMYB4/DJC//dBZINxZhGyt2a4bXDgjO/jN9AeXge+M7enc758DjUEOjFsNLcHvwFiCDkl5J/xXRmEnIpiHCEPKOiklW8QQwe2IbNIEcgi+/Ar4GmINyB8YrQnQzYTCML4DNMSAE8CyKIKMAXiLOMKrdrutF+S3iIOutkSaFqZ8E9Kb38wRwtmtuYKYgzVJYvBC00bTYWA5br+zDWknIatcsPCGaZubGFFgpKD1Pae61xIMDAYOiKMkYxxSY6dCQlbgj1yQU8RGxKBBMp5mfH/ezkw/tv+LEVz3TZSQLDYQRtxYogSydhpuYVxHuV0LOsbDJNlZuKDbadjRtPSOrwl+c2qfAgrjMOKBFCGICF6iVTu9y3kahhJNjRtpyNe5JdBCSd2R0uCoUCLnwG95yUJZRU2uiHhIr2nzT/OJPw9ce2Sbnt1vvUrYIqAwgSGDwKDAYK+l+/0OWt/3ae9Bvw/03nm7+1YHX6oex7KYgDDlxkq47x0IM04o3JAtBNGaEnynlV7Z+uduBrtjHG4ingAKGQ8pz0dig6MNZHc4iqVTqomv4pDD1z+1Xq0J4zjcwNc/ATkryhgnGxZRlPKPH+VWbDRtSShAAGHQesXgV9ADb8673de/gphIAVSEMaC3vg88O7i0RzPb9WRUzkz/8l4/CCkAVhSmwLj4Cl7+Lae2pxcvjzB48QIsKAxvJIcl2i3bQsCAX6VAD1aRsdiqTxDKigmDJTVLIExBr1ghJhhqDMbAQEDvVMTsxHqzoBojGY3gEYIDCsvxfHd6mpMz8XxzNGomyBmdpBtMJxfOcE8i5aJ667vleOankR14nrC58FBOM3jgoDFi4SKBnncJ/vyzYuPK5J2n6SlF25BDAFdUJMyUkts7EMax/IQYeNn6PnOda9O3A3vo2p4XzNzpv38OTMsSn+5fVuXzLqfzkZWrMHft4NL3Z2pCs7yPmR0MzGYG4kdFfUahmDMTSgzMffXnM0soMTCDge36XtVRy8k2j2y8RZTgDcRcWumIcoO550/HgqPvzj2/WcCS/0BG7yAcQMrREkXC8EeFFBIoAQwsZJjO/U/T+URIMR6bE+u+1paKVhnu2nS9QyoZWtswAa0dTdUeFHJ6F23iAC2DZYiSjELwrgt64B1oHUoAPn58cik7+/iit693hetkElyYzuhXqXseGh3Iow5hRp66tTJpO9Y9+KEP9E1IRRk60FN5uCuSM8IrsAmxES9kwjayVGRYsEzCFRAVskQICVmxgJMAbiHmDOjmldceeHZbpfhxiK2FmXEyl/MvknB1gRKog6Nfq3C7TQnlAuiwNcmSOGA3KA3wFsUoDGKKtpAy7eFYkBfnfutVzbYEmASMh5yBntifXhcIzAWM6PbIKq81Cnm/9c/StSnkujRjt9aAFyFKYCxgVQw5pBuEoXA0xRQopiAXM18WLCAQK6cwVmbdbfXk2rEcM7Bc59p2i3RYcXS99X04mweTqWXfK6mKiBIuowiazdQchE0bGyUwxPN0OJtbyjw6eDAkxWtiUORbVc5dyEiyhbEO6seb+ZRZwow3CM+ZcOeHY5p2fWkFo+lwV4v6J+BcibBbD6aCh7st9jjiMAYrksQQA7QJVxCkFBZ8j8dJbrtBgQwdMX1n04NxyepiPhqVddG1/23uuLbVX4ai+JcIoHQOxwuuL0Xi6wOxyzWZTaoxZyLkry8tsQ+cErDIuIz0OitgwsGSZDjWa7CJIJf4ZDL1gwuRpaq5sl54IVnFp1tTT7hlK8eYUy+YmGNbuPSLF0BoVctFqFh48iMcOd8eC6ZMB5UPOxsqywwr+/qrilJhqhimEMcQRwiyYnrIEcH6Ue/PKct9dTMsAG0pweEXyhn11veJbVueyPe+6Uxs19qP3MIw3317ZM+mrh/YE4FeDsiUWcBj7OLDBIoMHM+SbIVwKeDBuCo7kGfpYOJYiLKTqk8g/0bozQHbvVGt1NrxgisBFka2X6fJUUVi8g0nJIyvaMZ4InJ2MVIaOf4tZBtvjTas9D6xqrJd4NkDgVv8kRd8mk59z3fN2cyZDJ8tiQejjEJ/5H0ihDNOw/QqW8AEcvsWRoVBnkAshXZtIdxBHjhyLtI9eZwqUqXw5eFsntclpteWlTJ3SD87XVN+eFpNgZhlFFZLyuHIfk7L90cIaNnXzsAOZqP50JkEzkUg4sQ+lu9KLmNnWOpXLZtKRWMJdImj8nNn/rujVDZiuEURNFK5D20GqfhYgxvFT9kBeTLDdiXDih8O4XOYdHpdY4NWgfAiDld3snbq4CPoxHDbwVmSgH/846U4smq/e2rSF62C7Pu6sJXwf98efu4bgplRMAOiciRQ14RfSt/qV/7sZExg3ShMchllp6tOXNCqLiK01ezpRal+Xj+OuZE88bfreOtALxsKNhYww8SxioN68j20/dDPPN90fYm7H567m6Uj6UnhLAWCpHQkrReuKKf7MSGjVdaIC/OT6wyCsTkxh7Z7/By4X2/HpitqS6Xg1njzqfQuRb4IFxRF4xCHK4HLmr97yv7m1ljK+ZuC96mdPSB/uLMSWXuHe/rAwA3p4sBCB9lYApviu5MKqqw3RqtZSDmSYAI8HCvEO97+0m0cNyf5A1hhTQdXtitQnjNprG4McvD3W9UzIdENpEIPhIGRgZZnuyo+XGcycGbmKBiMHHviB44lW7+N33v2wLV9IYn5H6LYFs0T1x46nu9+DsRM4cWlCMbtYwBWXivFr4gnJo7FX7LRUXpjM4mmRRSGHIqBcYjREjJuIbqz2qXpFe0MzzbdwWVgTcfmEdvpre919NWW4MeGTrEEV4ZqZBoMhjRaGzHZhAg3NAfqFvKUY8sOzfFydKOsUq1Ap49gV7+wyuHr6pcjKHDX3Jk4lTmDiVNBfbPr88CamyMRlIOrY1j2EbjCuhzMtudFJKlPe3DvOLR+9Do7VFmstRsBu1PFCWFlZJXCyk/7p/2x7Xnm0A6mF4F/aQeW+TkHXLXNiAb6P8EiZPD8LTBi4XjCDzaEx/sr+aY7tP1gMJrOC5uYwjsHa4TDQUKy+GBJCnm4Gg9cdVi9IFRS7jPNsdvl1PO9onlrDu3JkX7gcVeaqY7sQHXRLgnjpS/WfLW38XstysB3zYk3M12Rli7nQzuYmUP7yb5QerRPQ8zSkELML7MVnIUrWPH3mm+PiOb9Zs5krni+ON63MFW9twdDdcEwdKfz2fVZ43qNSPRB/hDgM1pRkqXbs1rgKVBeA+y8mn+yR8IFpTjBxcgcen0jZ2eoatbPBdAlXHxWXJcZUSpU5t54L46ELBPbD3x7PBuZvl0fRbvJ0hIY8oDDTZqEHErltedYr+RpiPWMZRKung7hS1uW9ijtSVWvwaDwawYZl1dsJOP93rsNMHbLl3QQxylBmPczjG4/dDodmuGq5rs/24xEN2C3gto51s/1bbMERXCPPj9Jldi/AGE/AAY3W0gHZCPCBqgNcSe2b3uBAHDOdPLB0Lvtbrur3wO91z77ud3VD+DZMw1fyv8XmT5w5xPfGdtyB/o1Ju5TuCG8YoYc71UBSMHVcryrwP88a04OT9N6gXC8IRnmzdE6x4h/0Vz4NUMUsr6YYagpOSfNXHJI674ogvR4GfTuWMSTogyqT48NbHGAr0uiFcefj5yx43sNBms8wUG+q+jzBG0Qr8KeB989Qs8cgxaK5h8rjShPgOLJNLDmMwGOp2PHG8yncy/45DrWM8qTWmdCrCyd4hklG8Si7BNFsahOR758VHdWXTg86jTZJF+2yDDPPBymbE24uhcq3WBvtJCovhn84JKvUeq6dvhZHPci2PvZ6P78Hhpvu28iY/Hm3ZkR9t6f9SA86/4MoYgLdsc6i4x1thvx//x01Vlvg4yjpJNh4f+7C/n88r33Bv3xl6/yB9ZVAaJRW7Zbqlnj2hw5luk700lgu26/q2nmzMlPVuoK0bV917G9/rtusckVCmmofh/82M5vvxOEb9o/7tuuiWOvK18PyQwu7yAPGN+D/n+D//y9a7z/8vc/2vW/W41LWRNvb6XKfj9VgWbGZznjyjuNk1C2oQOqWgRev/WqKQDCFIlUCemEJYTcZKkO9LoL5j1DVqS9Bz1w1gU4nw3KYv4OGJJPv1uzCfrrUjzP9/r5S5y9vpYYr7FDy/M9oW33oaJi5Z0gDxc97EK5tgzRH/Xe+S/t8zft3tn7du9c/xHUN6IOvFqefa9+8YLKMqqnIKwzmk6vBIIs2jsP1HskxyZeuU0e1QncbfHgMZtbDad7dWuNI2Bs/1UXTG/fvpE9LmX7Y2SC6hEKly8Miq0/eZD9f6pepcA98p2EbBKdeikBQhyDGxTdCEKyXBbEOV1KiXx5GfKijac6XaoB1fRAQlDIzvoC4c4mxPFCgB4lV85/iTBiaxjnC+2tAF6UxXO/X3mo5EsKF4RwQBXSi38CakDogkkMAcKgBzYIZxy+VFIVD1mBEQGdrTMek28YGBT0wAv9GfW47tVphvN3p4cu+TTWB9d984np+/bEsq1gPhu6pmU3AcTdz3xeJH7LcfsKY4cpF/9J9NyOO+/fp5AiEqNIb7gVar2KEcXhRr5p2+N4r78+uAAiWbSuIdsjitYbEoPu+du3pyjVJpsz/8OHWS7khw/K14xZGN2EK2iMEBPR3dN/fQk+fnweRxxyDnEMY2OermgYw0fz270DzfAmZDfyKWkcouSuOFHsRoxMMS/PGvWMoLwm+L9gJLISrWEjxxuYFM9bDQMTY5GI4/IjGVb5PYd5nXJ11zEnIxAmT7xG+gsCr/pAwPTNk/Q731S3RDuXLDwSMfmuhWVpSiiHMVjcgZuQh+rlB/sJfENJIkkWMN/6+OW+7x/iif3NyB84gRgvDVEqNiFHkYEJR8s7govdPsKAcZI+f3YeP/vzi7dPRQjsXSR4nz3fHg/80eHd2DMWUB77v2B/cLn3161S8fT8z+rdmq7eoAL1hLysqm1xVgAK5oCIYAwjjggG0RpGNyAiMfygg9Y+/jhyWQdxXPtSfdeYrLsaEjVfFYTH/lsQTVOGORBM0/5mTy/+JwAA//9dgNZDhjIAAA== - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/RawUbuntu/line126.sh b/pkg/agent/testdata/RawUbuntu/line126.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/RawUbuntu/line126.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line124.sh b/pkg/agent/testdata/RawUbuntu/line127.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line124.sh rename to pkg/agent/testdata/RawUbuntu/line127.sh diff --git a/pkg/agent/testdata/RawUbuntu/line133.sh b/pkg/agent/testdata/RawUbuntu/line133.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/RawUbuntu/line133.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line131.sh b/pkg/agent/testdata/RawUbuntu/line134.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line131.sh rename to pkg/agent/testdata/RawUbuntu/line134.sh diff --git a/pkg/agent/testdata/RawUbuntu/line140.sh b/pkg/agent/testdata/RawUbuntu/line140.sh deleted file mode 100644 index 2f855de5428..00000000000 --- a/pkg/agent/testdata/RawUbuntu/line140.sh +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Runs snapshot update script periodically - -[Timer] -OnBootSec=10min -OnUnitActiveSec=10min - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line138.sh b/pkg/agent/testdata/RawUbuntu/line141.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line138.sh rename to pkg/agent/testdata/RawUbuntu/line141.sh diff --git a/pkg/agent/testdata/RawUbuntu/line147.sh b/pkg/agent/testdata/RawUbuntu/line149.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line147.sh rename to pkg/agent/testdata/RawUbuntu/line149.sh diff --git a/pkg/agent/testdata/RawUbuntu/line154.sh b/pkg/agent/testdata/RawUbuntu/line156.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line154.sh rename to pkg/agent/testdata/RawUbuntu/line156.sh diff --git a/pkg/agent/testdata/RawUbuntu/line161.sh b/pkg/agent/testdata/RawUbuntu/line163.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line161.sh rename to pkg/agent/testdata/RawUbuntu/line163.sh diff --git a/pkg/agent/testdata/RawUbuntu/line168.sh b/pkg/agent/testdata/RawUbuntu/line170.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line168.sh rename to pkg/agent/testdata/RawUbuntu/line170.sh diff --git a/pkg/agent/testdata/RawUbuntu/line213.sh b/pkg/agent/testdata/RawUbuntu/line215.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line213.sh rename to pkg/agent/testdata/RawUbuntu/line215.sh diff --git a/pkg/agent/testdata/RawUbuntu/line220.sh b/pkg/agent/testdata/RawUbuntu/line222.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line220.sh rename to pkg/agent/testdata/RawUbuntu/line222.sh diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line309.sh b/pkg/agent/testdata/RawUbuntu/line314.sh similarity index 100% rename from pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line309.sh rename to pkg/agent/testdata/RawUbuntu/line314.sh diff --git a/pkg/agent/testdata/RawUbuntu/line33.sh b/pkg/agent/testdata/RawUbuntu/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/RawUbuntu/line33.sh +++ b/pkg/agent/testdata/RawUbuntu/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index d444982c47d..254ffdd0954 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -30,7 +30,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_installs.sh permissions: "0744" @@ -118,6 +118,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/4SS0YubQBDG3/0rvpp76BVTa3ulXI4+lN41CE0MJelrWddRh5pd2V1tQsj/XjRcIiSgDMLOzu+bj5mdvAlTVmEqbOl5k2Wyfpnhe2MMKVftAyxbzlig4tQIs8eWi2ktjKMMb0vnajsLw4Jd2aTvpd6Gy9/xc/wtvFTdQwqltMM/bf6iNromU+2RkhSNJegcriToxmWi05yvNsgMt2TQkrGslTdZJ8/JDBtLw+avfpxGpnuN7oIdawWROzJ9TqS6JbC1TfdHzjvK4C3i+Z/Vr+RH/PPl690hOnpSWMLdYZA/ghU8APAX8Twq/Pv+0H2qH8jUbrnzg6ksGNFjcBVn4OnpLPRxVOgh6OMW/GkMfgxuNn0Y4z7for6MUR8GFE6zenchSJYafrd4gVZUfFotK+uEktQ9hJwr8i/1O3aIhkbICuldNZb8PwAA//+R/AassAIAAA== + - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -139,6 +140,7 @@ write_files: content: !!binary | H4sIAAAAAAAA/0TMPapCMRBA4X5WkQ28hy4ghRcbqwv+YBFSDMmgA8kkZCbC3b2Ihe058IWbsEU4kqbB3biJP09Rp4Jdn83c7BmN3He7ToNb5oSlbADhypVGhFWW1uxCye93lQVW+aiHZPyiX4VwEjUsJcIdxSgvm6+zGP9NpfFvOB5k7wAAAP//XnoOYJAAAAA= + - path: /opt/azure/containers/bind-mount.sh permissions: "0544" encoding: gzip diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line126.sh b/pkg/agent/testdata/RawUbuntuContainerd/line126.sh deleted file mode 100644 index cbfa6afe707..00000000000 --- a/pkg/agent/testdata/RawUbuntuContainerd/line126.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env bash - -set -o nounset -set -e - -source /opt/azure/containers/provision_source_distro.sh - -unattended_upgrade() { - retries=10 - for i in $(seq 1 $retries); do - unattended-upgrade -v && break - if [ $i -eq $retries ]; then - return 1 - else sleep 5 - fi - done - echo Executed unattended upgrade $i times -} - -cfg_has_option() { - file=$1 - option=$2 - line=$(sed -n "/^$option:/ p" "$file") - [ -n "$line" ] -} - -cfg_set_option() { - file=$1 - option=$2 - value=$3 - if ! cfg_has_option "$file" "$option"; then - echo "$option: $value" >> "$file" - else - sed -i 's/'"$option"':.*$/'"$option: $value"'/g' "$file" - fi -} - -KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" - -source_list_path=/etc/apt/sources.list -source_list_backup_path=/etc/apt/sources.list.backup -cloud_cfg_path=/etc/cloud/cloud.cfg - -while [ ! -f /var/lib/kubelet/kubeconfig ]; do - echo 'Waiting for TLS bootstrapping' - sleep 3 -done - -node_name=$(hostname) -if [ -z "${node_name}" ]; then - echo "cannot get node name" - exit 1 -fi - -golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") -if [ -z "${golden_timestamp}" ]; then - echo "golden timestamp is not set, skip live patching" - exit 0 -fi -echo "golden timestamp is: ${golden_timestamp}" - -current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") -if [ -n "${current_timestamp}" ]; then - echo "current timestamp is: ${current_timestamp}" - - if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then - echo "golden and current timestamp is the same, nothing to patch" - exit 0 - fi -fi - -old_source_list=$(cat ${source_list_path}) -sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -sed -i 's/https:\/\/snapshot.ubuntu.com\/ubuntu\/\([0-9]\{8\}T[0-9]\{6\}Z\)/https:\/\/snapshot.ubuntu.com\/ubuntu\/'"${golden_timestamp}"'/g' ${source_list_path} -option=apt_preserve_sources_list -option_value=true -cfg_set_option ${cloud_cfg_path} ${option} ${option_value} - -new_source_list=$(cat ${source_list_path}) -if [[ "${old_source_list}" != "${new_source_list}" ]]; then - echo "$old_source_list" > ${source_list_backup_path} - echo "/etc/apt/sources.list is updated:" - diff ${source_list_backup_path} ${source_list_path} || true -fi - -if ! apt_get_update; then - echo "apt_get_update failed" - exit 1 -fi -if ! unattended_upgrade; then - echo "unattended_upgrade failed" - exit 1 -fi - -$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} - -echo snapshot update completed successfully diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line124.sh b/pkg/agent/testdata/RawUbuntuContainerd/line127.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line124.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line127.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line133.sh b/pkg/agent/testdata/RawUbuntuContainerd/line133.sh deleted file mode 100644 index 15be92f982a..00000000000 --- a/pkg/agent/testdata/RawUbuntuContainerd/line133.sh +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Snapshot Update Service - -[Service] -Type=oneshot -ExecStart=/opt/azure/containers/ubuntu-snapshot-update.sh \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line131.sh b/pkg/agent/testdata/RawUbuntuContainerd/line134.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line131.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line134.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line140.sh b/pkg/agent/testdata/RawUbuntuContainerd/line140.sh deleted file mode 100644 index 2f855de5428..00000000000 --- a/pkg/agent/testdata/RawUbuntuContainerd/line140.sh +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Runs snapshot update script periodically - -[Timer] -OnBootSec=10min -OnUnitActiveSec=10min - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line138.sh b/pkg/agent/testdata/RawUbuntuContainerd/line141.sh similarity index 100% rename from pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line138.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line141.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line147.sh b/pkg/agent/testdata/RawUbuntuContainerd/line149.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line147.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line149.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line154.sh b/pkg/agent/testdata/RawUbuntuContainerd/line156.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line154.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line156.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line161.sh b/pkg/agent/testdata/RawUbuntuContainerd/line163.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line161.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line163.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line168.sh b/pkg/agent/testdata/RawUbuntuContainerd/line170.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line168.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line170.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line213.sh b/pkg/agent/testdata/RawUbuntuContainerd/line215.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line213.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line215.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line220.sh b/pkg/agent/testdata/RawUbuntuContainerd/line222.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntuContainerd/line220.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line222.sh diff --git a/pkg/agent/testdata/RawUbuntu/line312.sh b/pkg/agent/testdata/RawUbuntuContainerd/line313.sh similarity index 100% rename from pkg/agent/testdata/RawUbuntu/line312.sh rename to pkg/agent/testdata/RawUbuntuContainerd/line313.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line33.sh b/pkg/agent/testdata/RawUbuntuContainerd/line33.sh index 550ecf257e3..201331b1489 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line33.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line33.sh @@ -262,7 +262,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi diff --git a/pkg/agent/variables.go b/pkg/agent/variables.go index 64bcddc6e83..e41d6b19cbc 100644 --- a/pkg/agent/variables.go +++ b/pkg/agent/variables.go @@ -49,6 +49,9 @@ func getCustomDataVariables(config *datamodel.NodeBootstrappingConfiguration) pa "snapshotUpdateScript": getBase64EncodedGzippedCustomScript(snapshotUpdateScript, config), "snapshotUpdateService": getBase64EncodedGzippedCustomScript(snapshotUpdateSystemdService, config), "snapshotUpdateTimer": getBase64EncodedGzippedCustomScript(snapshotUpdateSystemdTimer, config), + "packageUpdateScriptMariner": getBase64EncodedGzippedCustomScript(packageUpdateScriptMariner, config), + "packageUpdateServiceMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdServiceMariner, config), + "packageUpdateTimerMariner": getBase64EncodedGzippedCustomScript(packageUpdateSystemdTimerMariner, config), "componentManifestFile": getBase64EncodedGzippedCustomScript(componentManifestFile, config), }, } diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 7e335886d46..9a554fb7337 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -61,6 +61,9 @@ // linux/cloud-init/artifacts/manifest.json // linux/cloud-init/artifacts/mariner/cse_helpers_mariner.sh // linux/cloud-init/artifacts/mariner/cse_install_mariner.sh +// linux/cloud-init/artifacts/mariner/mariner-package-update.sh +// linux/cloud-init/artifacts/mariner/package-update.service +// linux/cloud-init/artifacts/mariner/package-update.timer // linux/cloud-init/artifacts/mariner/pam-d-system-auth // linux/cloud-init/artifacts/mariner/pam-d-system-password // linux/cloud-init/artifacts/mariner/update_certs_mariner.service @@ -4230,7 +4233,7 @@ if [ "${ENSURE_NO_DUPE_PROMISCUOUS_BRIDGE}" == "true" ]; then logs_to_events "AKS.CSE.ensureNoDupOnPromiscuBridge" ensureNoDupOnPromiscuBridge fi -if [[ $OS == $UBUNTU_OS_NAME ]]; then +if [[ $OS == $UBUNTU_OS_NAME ]] || [[ $OS == $MARINER_OS_NAME ]]; then logs_to_events "AKS.CSE.ubuntuSnapshotUpdate" ensureSnapshotUpdate fi @@ -5609,6 +5612,126 @@ func linuxCloudInitArtifactsMarinerCse_install_marinerSh() (*asset, error) { return a, nil } +var _linuxCloudInitArtifactsMarinerMarinerPackageUpdateSh = []byte(`#!/usr/bin/env bash + +set -o nounset +set -e + +# source dnf_update +source /opt/azure/containers/provision_source_distro.sh + +KUBECTL="/usr/local/bin/kubectl --kubeconfig /var/lib/kubelet/kubeconfig" + +# At startup, we need to wait for kubelet to finish TLS bootstrapping to create the kubeconfig file. +n=0 +while [ ! -f /var/lib/kubelet/kubeconfig ]; do + echo 'Waiting for TLS bootstrapping' + if [[ $n -lt 100 ]]; then + n=$((n+1)) + sleep 3 + else + echo "timeout waiting for kubeconfig to be present" + exit 1 + fi +done + +node_name=$(hostname) +if [ -z "${node_name}" ]; then + echo "cannot get node name" + exit 1 +fi + +# retrieve golden timestamp from node annotation +golden_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-golden-timestamp']}") +if [ -z "${golden_timestamp}" ]; then + echo "golden timestamp is not set, skip live patching" + exit 0 +fi +echo "golden timestamp is: ${golden_timestamp}" + +current_timestamp=$($KUBECTL get node ${node_name} -o jsonpath="{.metadata.annotations['kubernetes\.azure\.com/live-patching-current-timestamp']}") +if [ -n "${current_timestamp}" ]; then + echo "current timestamp is: ${current_timestamp}" + + if [[ "${golden_timestamp}" == "${current_timestamp}" ]]; then + echo "golden and current timestamp is the same, nothing to patch" + exit 0 + fi +fi + +if ! dnf_update; then + echo "dnf_update failed" + exit 1 +fi + +# update current timestamp +$KUBECTL annotate --overwrite node ${node_name} kubernetes.azure.com/live-patching-current-timestamp=${golden_timestamp} + +echo "package update completed successfully" +`) + +func linuxCloudInitArtifactsMarinerMarinerPackageUpdateShBytes() ([]byte, error) { + return _linuxCloudInitArtifactsMarinerMarinerPackageUpdateSh, nil +} + +func linuxCloudInitArtifactsMarinerMarinerPackageUpdateSh() (*asset, error) { + bytes, err := linuxCloudInitArtifactsMarinerMarinerPackageUpdateShBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/mariner/mariner-package-update.sh", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _linuxCloudInitArtifactsMarinerPackageUpdateService = []byte(`[Unit] +Description=Package Update Service + +[Service] +Type=oneshot +ExecStart=/opt/azure/containers/mariner-package-update.sh`) + +func linuxCloudInitArtifactsMarinerPackageUpdateServiceBytes() ([]byte, error) { + return _linuxCloudInitArtifactsMarinerPackageUpdateService, nil +} + +func linuxCloudInitArtifactsMarinerPackageUpdateService() (*asset, error) { + bytes, err := linuxCloudInitArtifactsMarinerPackageUpdateServiceBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/mariner/package-update.service", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +var _linuxCloudInitArtifactsMarinerPackageUpdateTimer = []byte(`[Unit] +Description=Runs package update script periodically + +[Timer] +OnBootSec=10min +OnUnitActiveSec=10min + +[Install] +WantedBy=multi-user.target`) + +func linuxCloudInitArtifactsMarinerPackageUpdateTimerBytes() ([]byte, error) { + return _linuxCloudInitArtifactsMarinerPackageUpdateTimer, nil +} + +func linuxCloudInitArtifactsMarinerPackageUpdateTimer() (*asset, error) { + bytes, err := linuxCloudInitArtifactsMarinerPackageUpdateTimerBytes() + if err != nil { + return nil, err + } + + info := bindataFileInfo{name: "linux/cloud-init/artifacts/mariner/package-update.timer", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + var _linuxCloudInitArtifactsMarinerPamDSystemAuth = []byte(`# Begin /etc/pam.d/system-auth auth required pam_faillock.so preauth silent audit deny=5 unlock_time=900 @@ -7697,6 +7820,28 @@ write_files: content: !!binary | {{GetVariableProperty "cloudInitData" "migPartitionScript"}} +{{if IsMariner}} +- path: /opt/azure/containers/mariner-package-update.sh + permissions: "0544" + encoding: gzip + owner: root + content: !!binary | + {{GetVariableProperty "cloudInitData" "packageUpdateScriptMariner"}} + +- path: /etc/systemd/system/snapshot-update.service + permissions: "0644" + encoding: gzip + owner: root + content: !!binary | + {{GetVariableProperty "cloudInitData" "packageUpdateServiceMariner"}} + +- path: /etc/systemd/system/snapshot-update.timer + permissions: "0644" + encoding: gzip + owner: root + content: !!binary | + {{GetVariableProperty "cloudInitData" "packageUpdateTimerMariner"}} +{{- else}} - path: /opt/azure/containers/ubuntu-snapshot-update.sh permissions: "0544" encoding: gzip @@ -7717,6 +7862,7 @@ write_files: owner: root content: !!binary | {{GetVariableProperty "cloudInitData" "snapshotUpdateTimer"}} +{{end}} - path: /opt/azure/containers/bind-mount.sh permissions: "0544" @@ -9170,6 +9316,9 @@ var _bindata = map[string]func() (*asset, error){ "linux/cloud-init/artifacts/manifest.json": linuxCloudInitArtifactsManifestJson, "linux/cloud-init/artifacts/mariner/cse_helpers_mariner.sh": linuxCloudInitArtifactsMarinerCse_helpers_marinerSh, "linux/cloud-init/artifacts/mariner/cse_install_mariner.sh": linuxCloudInitArtifactsMarinerCse_install_marinerSh, + "linux/cloud-init/artifacts/mariner/mariner-package-update.sh": linuxCloudInitArtifactsMarinerMarinerPackageUpdateSh, + "linux/cloud-init/artifacts/mariner/package-update.service": linuxCloudInitArtifactsMarinerPackageUpdateService, + "linux/cloud-init/artifacts/mariner/package-update.timer": linuxCloudInitArtifactsMarinerPackageUpdateTimer, "linux/cloud-init/artifacts/mariner/pam-d-system-auth": linuxCloudInitArtifactsMarinerPamDSystemAuth, "linux/cloud-init/artifacts/mariner/pam-d-system-password": linuxCloudInitArtifactsMarinerPamDSystemPassword, "linux/cloud-init/artifacts/mariner/update_certs_mariner.service": linuxCloudInitArtifactsMarinerUpdate_certs_marinerService, @@ -9317,6 +9466,9 @@ var _bintree = &bintree{nil, map[string]*bintree{ "mariner": &bintree{nil, map[string]*bintree{ "cse_helpers_mariner.sh": &bintree{linuxCloudInitArtifactsMarinerCse_helpers_marinerSh, map[string]*bintree{}}, "cse_install_mariner.sh": &bintree{linuxCloudInitArtifactsMarinerCse_install_marinerSh, map[string]*bintree{}}, + "mariner-package-update.sh": &bintree{linuxCloudInitArtifactsMarinerMarinerPackageUpdateSh, map[string]*bintree{}}, + "package-update.service": &bintree{linuxCloudInitArtifactsMarinerPackageUpdateService, map[string]*bintree{}}, + "package-update.timer": &bintree{linuxCloudInitArtifactsMarinerPackageUpdateTimer, map[string]*bintree{}}, "pam-d-system-auth": &bintree{linuxCloudInitArtifactsMarinerPamDSystemAuth, map[string]*bintree{}}, "pam-d-system-password": &bintree{linuxCloudInitArtifactsMarinerPamDSystemPassword, map[string]*bintree{}}, "update_certs_mariner.service": &bintree{linuxCloudInitArtifactsMarinerUpdate_certs_marinerService, map[string]*bintree{}}, diff --git a/vhdbuilder/packer/packer_source.sh b/vhdbuilder/packer/packer_source.sh index e8b9435b684..5600b38a742 100644 --- a/vhdbuilder/packer/packer_source.sh +++ b/vhdbuilder/packer/packer_source.sh @@ -111,10 +111,12 @@ copyPackerFiles() { KUBELET_SERVICE_DEST=/etc/systemd/system/kubelet.service USU_SH_SRC=/home/packer/ubuntu-snapshot-update.sh USU_SH_DEST=/opt/azure/containers/ubuntu-snapshot-update.sh - USU_SERVICE_SRC=/home/packer/snapshot-update.service - USU_SERVICE_DEST=/etc/systemd/system/snapshot-update.service - USU_TIMER_SRC=/home/packer/snapshot-update.timer - USU_TIMER_DEST=/etc/systemd/system/snapshot-update.timer + MPU_SH_SRC=/home/packer/mariner-package-update.sh + MPU_SH_DEST=/opt/azure/containers/mariner-package-update.sh + SNAPSHOT_UPDATE_SERVICE_SRC=/home/packer/snapshot-update.service + SNAPSHOT_UPDATE_SERVICE_DEST=/etc/systemd/system/snapshot-update.service + SNAPSHOT_UPDATE_TIMER_SRC=/home/packer/snapshot-update.timer + SNAPSHOT_UPDATE_TIMER_DEST=/etc/systemd/system/snapshot-update.timer VHD_CLEANUP_SCRIPT_SRC=/home/packer/cleanup-vhd.sh VHD_CLEANUP_SCRIPT_DEST=/opt/azure/containers/cleanup-vhd.sh CONTAINER_IMAGE_PREFETCH_SCRIPT_SRC=/home/packer/prefetch.sh @@ -304,6 +306,8 @@ copyPackerFiles() { cpAndMode $CI_SYSLOG_WATCHER_PATH_SRC $CI_SYSLOG_WATCHER_PATH_DEST 644 cpAndMode $CI_SYSLOG_WATCHER_SERVICE_SRC $CI_SYSLOG_WATCHER_SERVICE_DEST 644 cpAndMode $CI_SYSLOG_WATCHER_SCRIPT_SRC $CI_SYSLOG_WATCHER_SCRIPT_DEST 755 + cpAndMode $SNAPSHOT_UPDATE_SERVICE_SRC $SNAPSHOT_UPDATE_SERVICE_DEST 644 + cpAndMode $SNAPSHOT_UPDATE_TIMER_SRC $SNAPSHOT_UPDATE_TIMER_DEST 644 if [[ $OS != $MARINER_OS_NAME ]]; then cpAndMode $DOCKER_CLEAR_MOUNT_PROPAGATION_FLAGS_SRC $DOCKER_CLEAR_MOUNT_PROPAGATION_FLAGS_DEST 644 @@ -311,11 +315,10 @@ copyPackerFiles() { cpAndMode $PAM_D_COMMON_AUTH_SRC $PAM_D_COMMON_AUTH_DEST 644 cpAndMode $PAM_D_COMMON_PASSWORD_SRC $PAM_D_COMMON_PASSWORD_DEST 644 cpAndMode $USU_SH_SRC $USU_SH_DEST 544 - cpAndMode $USU_SERVICE_SRC $USU_SERVICE_DEST 644 - cpAndMode $USU_TIMER_SRC $USU_TIMER_DEST 644 fi if [[ $OS == $MARINER_OS_NAME ]]; then cpAndMode $CONTAINERD_SERVICE_SRC $CONTAINERD_SERVICE_DEST 644 + cpAndMode $MPU_SH_SRC $MPU_SH_DEST 544 # MarinerV2 uses system-auth and system-password instead of common-auth and common-password. if [[ ${OS_VERSION} == "2.0" ]]; then diff --git a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json index 41bbc78165e..4c12e37bc5a 100644 --- a/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json +++ b/vhdbuilder/packer/vhd-image-builder-mariner-arm64.json @@ -509,6 +509,21 @@ "source": "parts/linux/cloud-init/artifacts/pam-d-su", "destination": "/home/packer/pam-d-su" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/mariner/mariner-package-update.sh", + "destination": "/home/packer/mariner-package-update.sh" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/mariner/package-update.service", + "destination": "/home/packer/snapshot-update.service" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/mariner/package-update.timer", + "destination": "/home/packer/snapshot-update.timer" + }, { "type": "file", "source": "vhdbuilder/notice.txt", diff --git a/vhdbuilder/packer/vhd-image-builder-mariner.json b/vhdbuilder/packer/vhd-image-builder-mariner.json index 9212bb1bb11..acd440b0e01 100644 --- a/vhdbuilder/packer/vhd-image-builder-mariner.json +++ b/vhdbuilder/packer/vhd-image-builder-mariner.json @@ -246,6 +246,21 @@ "source": "parts/linux/cloud-init/artifacts/cis.sh", "destination": "/home/packer/cis.sh" }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/mariner/mariner-package-update.sh", + "destination": "/home/packer/mariner-package-update.sh" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/mariner/package-update.service", + "destination": "/home/packer/snapshot-update.service" + }, + { + "type": "file", + "source": "parts/linux/cloud-init/artifacts/mariner/package-update.timer", + "destination": "/home/packer/snapshot-update.timer" + }, { "type": "file", "source": "vhdbuilder/scripts/linux/tool_installs.sh",