diff --git a/.pipelines/.vsts-vhd-builder-release-windows.yaml b/.pipelines/.vsts-vhd-builder-release-windows.yaml
index f06b304419d..24e0f27e96d 100644
--- a/.pipelines/.vsts-vhd-builder-release-windows.yaml
+++ b/.pipelines/.vsts-vhd-builder-release-windows.yaml
@@ -182,9 +182,6 @@ stages:
             docker run --rm \
             -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
             -w /go/src/github.com/Azure/AgentBaker \
-            -e CLIENT_ID=${AZURE_BUILD_CLIENT_ID} \
-            -e CLIENT_SECRET="$(AZURE_BUILD_CLIENT_SECRET)" \
-            -e TENANT_ID=${AZURE_BUILD_TENANT_ID} \
             -e SUBSCRIPTION_ID="${AZURE_BUILD_SUBSCRIPTION_ID}" \
             -e PROD_SUBSCRIPTION_ID=${AZURE_PROD_SUBSCRIPTION_ID} \
             -e AZURE_RESOURCE_GROUP_NAME=${AZURE_BUILD_RESOURCE_GROUP_NAME} \
diff --git a/.pipelines/templates/.builder-release-template-windows.yaml b/.pipelines/templates/.builder-release-template-windows.yaml
index 6247e4661c8..0b9adfcc38b 100644
--- a/.pipelines/templates/.builder-release-template-windows.yaml
+++ b/.pipelines/templates/.builder-release-template-windows.yaml
@@ -92,9 +92,6 @@ steps:
       -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
       -w /go/src/github.com/Azure/AgentBaker \
       -e POOL_NAME=$(AZURE_POOL_NAME) \
-      -e CLIENT_ID=${AZURE_BUILD_CLIENT_ID} \
-      -e CLIENT_SECRET="$(AZURE_BUILD_CLIENT_SECRET)" \
-      -e TENANT_ID=${AZURE_BUILD_TENANT_ID} \
       -e SUBSCRIPTION_ID="${AZURE_BUILD_SUBSCRIPTION_ID}" \
       -e AZURE_RESOURCE_GROUP_NAME=${AZURE_BUILD_RESOURCE_GROUP_NAME} \
       -e AZURE_LOCATION=${AZURE_BUILD_LOCATION} \
@@ -131,9 +128,6 @@ steps:
       docker run --rm \
       -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
       -w /go/src/github.com/Azure/AgentBaker \
-      -e CLIENT_ID=${AZURE_BUILD_CLIENT_ID} \
-      -e CLIENT_SECRET="$(AZURE_BUILD_CLIENT_SECRET)" \
-      -e TENANT_ID=${AZURE_BUILD_TENANT_ID} \
       -e SUBSCRIPTION_ID="${AZURE_BUILD_SUBSCRIPTION_ID}" \
       -e AZURE_RESOURCE_GROUP_NAME=${AZURE_BUILD_RESOURCE_GROUP_NAME} \
       -e OS_DISK_URI=${OS_DISK_URI} \
@@ -183,9 +177,6 @@ steps:
         docker run --rm \
         -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
         -w /go/src/github.com/Azure/AgentBaker \
-        -e CLIENT_ID=${AZURE_BUILD_CLIENT_ID} \
-        -e CLIENT_SECRET="$(AZURE_BUILD_CLIENT_SECRET)" \
-        -e TENANT_ID=${AZURE_BUILD_TENANT_ID} \
         -e SUBSCRIPTION_ID="${AZURE_BUILD_SUBSCRIPTION_ID}" \
         -e RESOURCE_GROUP_NAME="${AZURE_BUILD_RESOURCE_GROUP_NAME}" \
         -e LOCATION="${AZURE_BUILD_LOCATION}" \
@@ -221,9 +212,6 @@ steps:
       docker run --rm \
       -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
       -w /go/src/github.com/Azure/AgentBaker \
-      -e CLIENT_ID=${AZURE_BUILD_CLIENT_ID} \
-      -e CLIENT_SECRET="$(AZURE_BUILD_CLIENT_SECRET)" \
-      -e TENANT_ID=${AZURE_BUILD_TENANT_ID} \
       -e SUBSCRIPTION_ID="${AZURE_BUILD_SUBSCRIPTION_ID}" \
       -e SA_NAME=${SA_NAME} \
       -e AZURE_RESOURCE_GROUP_NAME=${AZURE_BUILD_RESOURCE_GROUP_NAME} \
@@ -258,9 +246,6 @@ steps:
       docker run --rm \
       -v ${PWD}:/go/src/github.com/Azure/AgentBaker \
       -w /go/src/github.com/Azure/AgentBaker \
-      -e CLIENT_ID=${CLIENT_ID} \
-      -e CLIENT_SECRET="$(CLIENT_SECRET)" \
-      -e TENANT_ID=${TENANT_ID} \
       -e SUBSCRIPTION_ID="${AZURE_PROD_SUBSCRIPTION_ID}" \
       -e CLASSIC_SA_CONNECTION_STRING="$(CLASSIC_SA_CONNECTION_STRING)" \
       -e STORAGE_ACCT_BLOB_URL=${STORAGE_ACCT_BLOB_URL} \
diff --git a/e2e/scenario/base_vhd_catalog.json b/e2e/scenario/base_vhd_catalog.json
index a2abfb17bb7..825cef9235a 100644
--- a/e2e/scenario/base_vhd_catalog.json
+++ b/e2e/scenario/base_vhd_catalog.json
@@ -2,17 +2,17 @@
     "ubuntu1804": {
         "gen2containerd": {
             "artifactName": "1804-gen2-containerd",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/1804Gen2/versions/1.1707351757.24005"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/1804Gen2/versions/1.1711058371.9154"
         }
     },
     "ubuntu2204": {
         "gen2arm64containerd": {
             "artifactName": "2204-arm64-gen2-containerd",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2Arm64/versions/1.1707351609.8691"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2Arm64/versions/1.1711050975.24443"
         },
         "gen2containerd": {
             "artifactName": "2204-gen2-containerd",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1707351742.21148"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1711058378.5173"
         },
         "gen2containerdprivatekubepkg": {
             "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/2204Gen2/versions/1.1704411049.2812"
@@ -21,21 +21,21 @@
     "azurelinuxv2": {
         "gen2arm64": {
             "artifactName": "azurelinuxv2-gen2-arm64",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2Arm64/versions/1.1707351611.19505"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2Arm64/versions/1.1711050992.12578"
         },
         "gen2": {
             "artifactName": "azurelinuxv2-gen2",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2/versions/1.1707351621.9878"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/AzureLinuxV2Gen2/versions/1.1711058377.30895"
         }
     },
     "cblmarinerv2": {
         "gen2arm64": {
             "artifactName": "marinerv2-gen2-arm64",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2Arm64/versions/1.1707351626.25667"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2Arm64/versions/1.1711051003.16083"
         },
         "gen2": {
             "artifactName": "marinerv2-gen2",
-            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2/versions/1.1707351721.29111"
+            "resourceId": "/subscriptions/8ecadfc9-d1a3-4ea4-b844-0d9f87e4d7c8/resourceGroups/aksvhdtestbuildrg/providers/Microsoft.Compute/galleries/PackerSigGalleryEastUS/images/CBLMarinerV2Gen2/versions/1.1711051012.17839"
         }
     }
 }
diff --git a/e2e/scenario/scenario_marinerv2.go b/e2e/scenario/scenario_marinerv2.go
index 04ed6cc757c..033221a9881 100644
--- a/e2e/scenario/scenario_marinerv2.go
+++ b/e2e/scenario/scenario_marinerv2.go
@@ -16,9 +16,6 @@ func (t *Template) marinerv2() *Scenario {
 				nbc.ContainerService.Properties.AgentPoolProfiles[0].Distro = "aks-cblmariner-v2-gen2"
 				nbc.AgentPoolProfile.Distro = "aks-cblmariner-v2-gen2"
 			},
-			LiveVMValidators: []*LiveVMValidator{
-				KubenetEnsureNoDupEbtablesValidator(),
-			},
 		},
 	}
 }
diff --git a/e2e/scenario/scenario_ubuntu2204.go b/e2e/scenario/scenario_ubuntu2204.go
index 82ce6b8837e..81b71761c49 100644
--- a/e2e/scenario/scenario_ubuntu2204.go
+++ b/e2e/scenario/scenario_ubuntu2204.go
@@ -16,9 +16,6 @@ func (t *Template) ubuntu2204() *Scenario {
 				nbc.ContainerService.Properties.AgentPoolProfiles[0].Distro = "aks-ubuntu-containerd-22.04-gen2"
 				nbc.AgentPoolProfile.Distro = "aks-ubuntu-containerd-22.04-gen2"
 			},
-			LiveVMValidators: []*LiveVMValidator{
-				KubenetEnsureNoDupEbtablesValidator(),
-			},
 		},
 	}
 }
diff --git a/e2e/scenario/validators.go b/e2e/scenario/validators.go
index 75a2cbd3946..87cd46134b8 100644
--- a/e2e/scenario/validators.go
+++ b/e2e/scenario/validators.go
@@ -2,7 +2,6 @@ package scenario
 
 import (
 	"fmt"
-	"regexp"
 	"strings"
 )
 
@@ -127,42 +126,6 @@ func UlimitValidator(ulimits map[string]string) *LiveVMValidator {
 	}
 }
 
-// KubenetEnsureNoDupEbtablesValidator checks that ebtables rules were installed by
-// the ensure-no-dup.sh script to block duplicate packets from the promiscuous bridge.
-// This assumes at least one pod (without hostNetwork) has already run on the node.
-func KubenetEnsureNoDupEbtablesValidator() *LiveVMValidator {
-	// Use regex match for the rules because the MAC and IP addresses can vary.
-	expectedRulePatterns := []string{
-		`-j AKS-DEDUP-PROMISC`,
-		`-p IPv4 -s [0-9a-f:]+ -o veth\+ --ip-src [0-9.]+ -j ACCEPT`,
-		`-p IPv4 -s [0-9a-f:]+ -o veth\+ --ip-src [0-9.]+/[0-9]+ -j DROP`,
-	}
-	regexes := make(map[string]*regexp.Regexp, len(expectedRulePatterns))
-	for _, s := range expectedRulePatterns {
-		regexes[s] = regexp.MustCompile(s)
-	}
-
-	return &LiveVMValidator{
-		Description: "assert kubenet ensure-no-dup ebtables rules",
-		// Grep matches rules with "-" at start of line.
-		// This command will fail and be retried to account for delay between
-		// when the CNI creates the bridge and when the ensure-no-dup systemd unit completes.
-		Command: fmt.Sprintf(`ebtables -L | grep "^-"`),
-		Asserter: func(code, stdout, stderr string) error {
-			if code != "0" {
-				return fmt.Errorf("validator command terminated with exit code %q but expected code 0", code)
-			}
-
-			for pattern, re := range regexes {
-				if !re.MatchString(stdout) {
-					return fmt.Errorf("could not find expected ebtables rule matching pattern %q", pattern)
-				}
-			}
-			return nil
-		},
-	}
-}
-
 func containerdVersionValidator(version string) *LiveVMValidator {
 	return &LiveVMValidator{
 		Description: "assert containerd version",
diff --git a/e2e/windows/e2e-scenario.sh b/e2e/windows/e2e-scenario.sh
index 315a1c7bdfc..fb51265ddfb 100644
--- a/e2e/windows/e2e-scenario.sh
+++ b/e2e/windows/e2e-scenario.sh
@@ -41,6 +41,19 @@ collect-logs() {
             err "Failed in deleting cse logs in remote storage. Error code is $retval."
         fi
     fi
+
+    array=(azcopy_*)
+    ${array[0]}/azcopy copy "https://${AZURE_E2E_STORAGE_ACCOUNT_NAME}.blob.core.windows.net/${AZURE_E2E_STORAGE_LOG_CONTAINER}/${DEPLOYMENT_VMSS_NAME}-provision.complete" $SCENARIO_NAME-logs/$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-provision.complete || retval=$?
+    if [ "$retval" -ne 0 ]; then
+        err "Failed in downloading provision.complete. Error code is $retval."
+        exit 1
+    else
+        log "provision.complete is generated"
+        ${array[0]}/azcopy rm "https://${AZURE_E2E_STORAGE_ACCOUNT_NAME}.blob.core.windows.net/${AZURE_E2E_STORAGE_LOG_CONTAINER}/${DEPLOYMENT_VMSS_NAME}-provision.complete" || retval=$?
+        if [ "$retval" -ne 0 ]; then
+            err "Failed in deleting provision.complete in remote storage. Error code is $retval."
+        fi
+    fi
 }
 
 E2E_RESOURCE_GROUP_NAME="$AZURE_E2E_RESOURCE_GROUP_NAME-$WINDOWS_E2E_IMAGE$WINDOWS_GPU_DRIVER_SUFFIX-$K8S_VERSION"
@@ -183,7 +196,7 @@ else
 fi
 
 log "Collect cse log"
-collect-logs 
+collect-logs
 
 cat $SCENARIO_NAME-vmss.json
 
diff --git a/e2e/windows/upload-cse-logs.ps1 b/e2e/windows/upload-cse-logs.ps1
index d6fd5552166..c8e372bbe50 100644
--- a/e2e/windows/upload-cse-logs.ps1
+++ b/e2e/windows/upload-cse-logs.ps1
@@ -5,4 +5,4 @@ param(
     [string]$arg4
 )
 
-Invoke-WebRequest -UseBasicParsing https://aka.ms/downloadazcopy-v10-windows -OutFile azcopy.zip;expand-archive azcopy.zip;cd .\azcopy\*; $env:AZCOPY_AUTO_LOGIN_TYPE="MSI"; $env:AZCOPY_MSI_RESOURCE_STRING=$arg4; .\azcopy.exe copy "C:\azuredata\CustomDataSetupScript.log" "https://$arg1.blob.core.windows.net/$arg2/$arg3-cse.log"
\ No newline at end of file
+Invoke-WebRequest -UseBasicParsing https://aka.ms/downloadazcopy-v10-windows -OutFile azcopy.zip;expand-archive azcopy.zip;cd .\azcopy\*; $env:AZCOPY_AUTO_LOGIN_TYPE="MSI"; $env:AZCOPY_MSI_RESOURCE_STRING=$arg4; .\azcopy.exe copy "C:\azuredata\CustomDataSetupScript.log" "https://$arg1.blob.core.windows.net/$arg2/$arg3-cse.log"; .\azcopy.exe copy "C:\AzureData\provision.complete" "https://$arg1.blob.core.windows.net/$arg2/$arg3-provision.complete"
\ No newline at end of file
diff --git a/parts/linux/cloud-init/artifacts/ensure-no-dup.sh b/parts/linux/cloud-init/artifacts/ensure-no-dup.sh
index be883a28d54..dbcc88d1f11 100644
--- a/parts/linux/cloud-init/artifacts/ensure-no-dup.sh
+++ b/parts/linux/cloud-init/artifacts/ensure-no-dup.sh
@@ -35,11 +35,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-# cloud-controller-manager assigns the node pod CIDR, then kubelet/containerd put it in the conflist.
-# Parse the conflist to retrieve the pod CIDR (IPv4 is always the first item in `ranges`).
-# If the field we expect isn't there, jq returns "null", so treat that as a failure.
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -56,4 +53,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/parts/windows/kuberneteswindowssetup.ps1 b/parts/windows/kuberneteswindowssetup.ps1
index 26d22b10042..92ebdb799cf 100644
--- a/parts/windows/kuberneteswindowssetup.ps1
+++ b/parts/windows/kuberneteswindowssetup.ps1
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/datamodel/linux_sig_version.json b/pkg/agent/datamodel/linux_sig_version.json
index f3f77c71c3a..89f3093de7b 100644
--- a/pkg/agent/datamodel/linux_sig_version.json
+++ b/pkg/agent/datamodel/linux_sig_version.json
@@ -1,4 +1,4 @@
 {
     "ostype": "LinuxSIGImageVersion",
-    "version": "202403.13.0"
+    "version": "202403.19.0"
 }
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
index aba1c29d981..f235d419e9e 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Containerd/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Containerd/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
index a4c31ce9d56..c64b7457521 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
index a4c31ce9d56..c64b7457521 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
index d4253850d53..3ee568f5807 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
index d4253850d53..3ee568f5807 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
index aba1c29d981..f235d419e9e 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+Docker/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+Docker/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+Docker/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
index 39cc6223268..98b15c03cba 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
index f2d6992e5b0..a337b9f4efc 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
@@ -226,7 +226,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line229.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line229.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line229.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line229.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
index aba1c29d981..f235d419e9e 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
index f9d1321185f..ca99c948859 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
index aba1c29d981..f235d419e9e 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line222.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
index af55a487f1e..41ab9f8c3d9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
@@ -220,7 +220,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line223.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line223.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line223.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line223.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
index 49f945b4329..16fc0e1246b 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
@@ -220,7 +220,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line223.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line223.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line223.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line223.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
index af55a487f1e..41ab9f8c3d9 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
@@ -220,7 +220,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line223.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line223.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line223.sh
+++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line223.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
index 52db0a62cbf..24da6920d45 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
index 009dbac7679..807d9d75361 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData
@@ -226,7 +226,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line229.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line229.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line229.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line229.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
index 592d516ac6d..021867bd755 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
index 0f67166fba7..fde31392878 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
index 493e9adcec3..038d6e26deb 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
index 009dbac7679..807d9d75361 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData
@@ -226,7 +226,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line229.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line229.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line229.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/line229.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
index 009dbac7679..807d9d75361 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData
@@ -226,7 +226,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line229.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line229.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line229.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line229.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
index 1cb1cef54ef..cf09e62e8ff 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData
@@ -226,7 +226,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line229.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line229.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line229.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line229.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
index 91626711670..74e91a0d035 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
index 0e7643c9555..26a5f1575de 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
index 52db0a62cbf..24da6920d45 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
index 592d516ac6d..021867bd755 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
index 4f7240fb450..d640511316a 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line222.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
index ce118cd4f83..5036a92a439 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line222.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
index b88b5e47f00..4649569ae4f 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line222.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line222.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
index 08bb6d9ed8c..7397b2c9353 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+China/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+China/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+China/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
index e01d292bac5..b795f5f4420 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData
@@ -226,7 +226,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line229.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line229.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line229.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/line229.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
index 6e369626a55..23fe3b716ec 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData
@@ -226,7 +226,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line229.sh b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line229.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line229.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/line229.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
index be89a365443..c1e5f7400f0 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
index 08874daa8d8..4869bfe46c0 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
index 08bb6d9ed8c..7397b2c9353 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
index 08bb6d9ed8c..7397b2c9353 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
index d0c943b974a..8ddddcc045e 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
index 6ca4d6f96a8..71e411616c8 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
index 52db0a62cbf..24da6920d45 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
index 08bb6d9ed8c..7397b2c9353 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
+++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line222.sh b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line222.sh
+++ b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData
index 12c2f6cb38b..47476a4c8b1 100644
--- a/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+CustomCloud/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData
index f6f8c4e6818..d12a1daa4e8 100644
--- a/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+CustomVnet/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData
index 98ee67d46d9..24d96e6a7ad 100644
--- a/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+EnablePrivateClusterHostsConfigAgent/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData
index d4b0a9c43dd..76138a87b04 100644
--- a/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+K8S116/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData
index c1a35bd85a5..3d802fda05b 100644
--- a/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+K8S117/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData
index bc5b2f15220..d7f14c138dd 100644
--- a/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+K8S118/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData
index ce4c3773efa..e020633c875 100644
--- a/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+K8S119+CSI/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData
index 77dfc72db1b..619b8908825 100644
--- a/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+K8S119+FIPS/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData
index 10a4eec97b6..ad0e25ba1d2 100644
--- a/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+K8S119/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData
index 8e19c2ec483..2816d0546fd 100644
--- a/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+KubeletClientTLSBootstrapping/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData
index 262ece221d4..6a8082b17e5 100644
--- a/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+ManagedIdentity/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData
index e05fe6bc3ab..4f072099aa2 100644
--- a/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData
+++ b/pkg/agent/testdata/AKSWindows2019+SecurityProfile/CustomData
@@ -59,6 +59,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
index ddddd653924..c33331be002 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/line219.sh b/pkg/agent/testdata/AzureLinuxV2+Kata/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AzureLinuxV2+Kata/line219.sh
+++ b/pkg/agent/testdata/AzureLinuxV2+Kata/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
index ddddd653924..c33331be002 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line219.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line219.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
index ddddd653924..c33331be002 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line219.sh b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line219.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
index ddddd653924..c33331be002 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line219.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line219.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
index ddddd653924..c33331be002 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line219.sh b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line219.sh
+++ b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData
index 2e0347a7282..de5965a7970 100644
--- a/pkg/agent/testdata/CustomizedImage/CustomData
+++ b/pkg/agent/testdata/CustomizedImage/CustomData
@@ -214,7 +214,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/CustomizedImage/line217.sh b/pkg/agent/testdata/CustomizedImage/line217.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/CustomizedImage/line217.sh
+++ b/pkg/agent/testdata/CustomizedImage/line217.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData
index 2e0347a7282..de5965a7970 100644
--- a/pkg/agent/testdata/CustomizedImageKata/CustomData
+++ b/pkg/agent/testdata/CustomizedImageKata/CustomData
@@ -214,7 +214,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/CustomizedImageKata/line217.sh b/pkg/agent/testdata/CustomizedImageKata/line217.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/CustomizedImageKata/line217.sh
+++ b/pkg/agent/testdata/CustomizedImageKata/line217.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
index 806fcbc1a63..a2b3ecf2450 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/line219.sh b/pkg/agent/testdata/MarinerV2+CustomCloud/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/MarinerV2+CustomCloud/line219.sh
+++ b/pkg/agent/testdata/MarinerV2+CustomCloud/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData
index 3002990655b..a08f4aad897 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/CustomData
+++ b/pkg/agent/testdata/MarinerV2+Kata/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/MarinerV2+Kata/line219.sh b/pkg/agent/testdata/MarinerV2+Kata/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/MarinerV2+Kata/line219.sh
+++ b/pkg/agent/testdata/MarinerV2+Kata/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
index 3002990655b..a08f4aad897 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line219.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line219.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
index 3002990655b..a08f4aad897 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line219.sh b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line219.sh
+++ b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
index 3002990655b..a08f4aad897 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line219.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line219.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
index 3002990655b..a08f4aad897 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData
@@ -216,7 +216,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line219.sh b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line219.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line219.sh
+++ b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/line219.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData
index aba1c29d981..f235d419e9e 100644
--- a/pkg/agent/testdata/RawUbuntu/CustomData
+++ b/pkg/agent/testdata/RawUbuntu/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/RawUbuntu/line222.sh b/pkg/agent/testdata/RawUbuntu/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/RawUbuntu/line222.sh
+++ b/pkg/agent/testdata/RawUbuntu/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
index ebc14b63572..85b9c9ff1c2 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData
+++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData
@@ -219,7 +219,7 @@ write_files:
   owner: root
   encoding: gzip
   content: !!binary |
-    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIhfeVE/q+vdkmNiHKpGqloP65olyY+EBcBTu1HTpW+O5TQtigTTc6ab0D5/g8j3/n+PjwIBxLFY65jT3Po7Hj44QsmMNEJo4M2DnaX67Yaff0ZsAGl/3e2VUH/30MBc1DlSWJJycYDlH7BEb3aGI0+gAXk/IAgKJYw3++32QJgSeGuFjAkvPX0V+lQ9ObyDLnAdgEIbkojJQMFblAhMdNFmnluFRkBMvXIq0mibSuSjlSEvl3OYXSDlmKBbkgCHIlqaYgbpLFlvhxLu6NjRRTuuAzatXqEXev8IAl7u7BDPwgTbKpVHY4whKWEopcPXCLlNBq4dZfa9z6DSwRrP/4DS81eiZt1NPiraS3FP1Gyd2vPW4tr3wctOA7k5FfxXidDrXHn9hWBW2pUKbJdGYx04J+gb6o+07h7cKGUcKtzc8e7uQPuRCGrH2Vnz2rX5b/bNCq1WWKXAk21g9PMi4xNZSCdTV8qcihPmyyd6N/boPG4/+r9W9/J6oqYIOcfcupb5RX+4MWmmxxupjPCVxBpvMTlHh+e9ZUi6tsrMi1hTBv1HEy5bPAcDUlO2yOhs1RYAsLT1jsWFv5WC6rVlstHOVT6Kjy9ussEQUcQY7MTCqCi2XOS9CRRaoFcjdYG0BhChOjZ3j51HtOj167s+G5Rx83PG9tmQuRZ34+McvJjCjmUvmVg/qiYltlYLsikKU4G8xPwOyPBuu1OyswjTm5+F8wJlNmTYStNgW7Q7vT6Q6u/4rObrFzsdPL/uAFqf7N9eDmunD0nEJJV2cuzVxRO0UPySK/JyQqNuTvk31fjfl8I7X9CP7Jw1mOvcNu/7P3PQAA//92JikohwcAAA==
+    H4sIAAAAAAAA/7yVX2/aPBTG7/MpnqZIL7yTE7r1ZpvYhCiTqpWC+ueKcmHiA3EV7NR26Fjhu08hYYM23eik9Q6c4/M753mOjg8PwrFU4Zjb2PM8Gjs+TsiCOUxk4siAnaH99ZKddE+uB2xw0e+dXnbw9lMoaB6qLEk8OcFwiNpnMLpDE6PRR7iYlAcAFMUa/tP7JksIPDHExQKWnF9Ef5MOTW8iy5wHYBOE5KIwUjJU5AIRHjVZpJXjUpERLD+LtJok0roqcqQk8u9yCqUdshQLckEQ5CSppiBuksUW/CiHe2MjxZTO+YxatXrE3QtqwBK3d2AGfpAm2VQqOxxhCUsJRa4euEVKaLVw4xeMG7+BJYLij9/wUqNn0kY9LV4LvUX0G6Xufu1h63jl46AF35mM/CqNi3SoPfySbbVWWyqUaTKdWcy0oN9Iv/Z9x3i7sGGUcGvz3sOd/CEXwpC1L6pnT/dL+08HrVpdpshJsLG+f5RxiamhFKyr4UtFDvVhk70f/X8TNB7erYrf/k5UVcBGcvY9V31DXu0vtNBk193FfE7gCjKdH6OU54+9plpcZmNFri2EeaWJkymfBXZNfdT+TjXVGkQ6S8S6X0GOzEwqgotlLoGg/yxSLZADUABguJoSJkbP8Hwjey6EXruzkWiP0Wx4XlEyFyLP/HQJlssWUcyl8it373nFtcrAdkUgS3E6mB+D2Z8z02t3VmAac3LxGzAmU2ZNhK3JA7tFu9PpDq7+CWfX4hx2ctEfPIPqX18Nrq/WFT1VoVRXZy7N3No7RffJIh99EhUX8ifHfqiW+WyD2n7X/uYtLDfZYbf/5UcAAAD//4wWzb9ZBwAA
 
 - path: /etc/systemd/system/teleportd.service
   permissions: "0644"
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line222.sh b/pkg/agent/testdata/RawUbuntuContainerd/line222.sh
index 31251fb808d..c606af08d4c 100644
--- a/pkg/agent/testdata/RawUbuntuContainerd/line222.sh
+++ b/pkg/agent/testdata/RawUbuntuContainerd/line222.sh
@@ -30,8 +30,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -48,4 +48,4 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
+#EOF
\ No newline at end of file
diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go
index 1688edd2848..0824a031309 100644
--- a/pkg/templates/templates_generated.go
+++ b/pkg/templates/templates_generated.go
@@ -4865,11 +4865,8 @@ if [[ -z "${bridgeIP}" ]]; then
     exit 1
 fi
 
-# cloud-controller-manager assigns the node pod CIDR, then kubelet/containerd put it in the conflist.
-# Parse the conflist to retrieve the pod CIDR (IPv4 is always the first item in `+"`"+`ranges`+"`"+`).
-# If the field we expect isn't there, jq returns "null", so treat that as a failure.
-podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.ranges[0][0].subnet")
-if [[ -z "${podSubnetAddr}" || "${podSubnetAddr}" == 'null' ]]; then
+podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist  | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet")
+if [[ -z "${podSubnetAddr}" ]]; then
     echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early"
     exit 1
 fi
@@ -4886,8 +4883,7 @@ echo "outputting newly added AKS-DEDUP-PROMISC rules:"
 ebtables -t filter -L OUTPUT 2>/dev/null
 ebtables -t filter -L AKS-DEDUP-PROMISC 2>/dev/null
 exit 0
-#EOF
-`)
+#EOF`)
 
 func linuxCloudInitArtifactsEnsureNoDupShBytes() ([]byte, error) {
 	return _linuxCloudInitArtifactsEnsureNoDupSh, nil
@@ -8278,6 +8274,10 @@ param(
     [ValidateNotNullOrEmpty()]
     $LogFile,
 
+    # C:\AzureData\provision.complete
+    # MUST keep generating this file when CSE is done and do not change the name
+    #  - It is used to avoid running CSE multiple times
+    #  - Some customers use this file to check if CSE is done
     [parameter(Mandatory=$true)]
     [ValidateNotNullOrEmpty()]
     $CSEResultFilePath,
diff --git a/vhdbuilder/packer/components.json b/vhdbuilder/packer/components.json
index 214441571d3..4d9bbb0089c 100644
--- a/vhdbuilder/packer/components.json
+++ b/vhdbuilder/packer/components.json
@@ -82,7 +82,8 @@
       "amd64OnlyVersions": [],
       "multiArchVersions": [
         "v1.3.4-1",
-        "v1.4.1"
+        "v1.4.1",
+        "v1.4.1-2"
       ]
     },
     {
@@ -198,6 +199,7 @@
       "amd64OnlyVersions": [],
       "multiArchVersions": [
         "1.13.10-1",
+        "1.13.10-2",
         "1.14.4",
         "1.14.4-1"
       ]
@@ -254,9 +256,8 @@
       "downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/azurefile-csi:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "v1.26.10",
         "v1.26.11",
-        "v1.28.8",
+        "v1.26.11-2",
         "v1.28.9",
         "v1.29.3",
         "v1.30.0"
@@ -267,8 +268,11 @@
       "amd64OnlyVersions": [],
       "multiArchVersions": [
         "v1.21.7",
+        "v1.21.7-2",
         "v1.22.5",
+        "v1.22.5-3",
         "v1.23.3",
+        "v1.23.3-3",
         "v1.24.0"
       ]
     },
@@ -294,8 +298,8 @@
       "downloadURL": "mcr.microsoft.com/oss/open-policy-agent/gatekeeper:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "v3.14.0",
-        "v3.13.3"
+        "v3.14.1",
+        "v3.14.0"
       ]
     },
     {
@@ -312,16 +316,16 @@
       "downloadURL": "mcr.microsoft.com/azure-policy/policy-kubernetes-addon-prod:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "1.3.0",
-        "1.2.1"
+        "1.3.1",
+        "1.3.0"
       ]
     },
     {
       "downloadURL": "mcr.microsoft.com/azure-policy/policy-kubernetes-webhook:*",
       "amd64OnlyVersions": [],
       "multiArchVersions": [
-        "1.3.0",
-        "1.2.1"
+        "1.3.1",
+        "1.3.0"
       ]
     },
     {
diff --git a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1 b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
index d222af94cd2..323ff27e92e 100644
--- a/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
+++ b/vhdbuilder/packer/generate-windows-vhd-configuration.ps1
@@ -14,6 +14,9 @@ $global:lowestFreeSpace = 2*1024*1024*1024 # 2GB
 # defaultContainerdPackageUrl refers to the stable containerd package used to pull and cache container images
 # Add cache for another containerd version which is not installed by default
 $global:defaultContainerdPackageUrl = "https://acs-mirror.azureedge.net/containerd/windows/v1.6.21-azure.1/binaries/containerd-v1.6.21-azure.1-windows-amd64.tar.gz"
+if ($windowsSKU -Like "23H2*") {
+    $global:defaultContainerdPackageUrl = "https://acs-mirror.azureedge.net/containerd/windows/v1.7.9-azure.1/binaries/containerd-v1.7.9-azure.1-windows-amd64.tar.gz"
+}
 
 # Windows Server 2019 update history can be found at https://support.microsoft.com/en-us/help/4464619
 # Windows Server 2022 update history can be found at https://support.microsoft.com/en-us/topic/windows-server-2022-update-history-e1caa597-00c5-4ab9-9f3e-8212fe80b2ee
diff --git a/vhdbuilder/packer/init-variables.sh b/vhdbuilder/packer/init-variables.sh
index 005400eecef..668abf837a4 100755
--- a/vhdbuilder/packer/init-variables.sh
+++ b/vhdbuilder/packer/init-variables.sh
@@ -44,15 +44,17 @@ echo "CAPTURED_SIG_VERSION set to: ${CAPTURED_SIG_VERSION}"
 echo "Subscription ID: ${SUBSCRIPTION_ID}"
 echo "Service Principal Path: ${SP_JSON}"
 
-if [ -a "${SP_JSON}" ]; then
-	echo "Existing credentials file found."
-	exit 0
-elif [ -z "${CLIENT_ID}" ]; then
-	echo "Service principal not found! Generating one @ ${SP_JSON}"
-	az ad sp create-for-rbac -n aks-images-packer${CREATE_TIME} -o json > ${SP_JSON}
-	CLIENT_ID=$(jq -r .appId ${SP_JSON})
-	CLIENT_SECRET=$(jq -r .password ${SP_JSON})
-	TENANT_ID=$(jq -r .tenant ${SP_JSON})
+if [ "$MODE" == "linuxVhdMode" ]; then
+	if [ -a "${SP_JSON}" ]; then
+		echo "Existing credentials file found."
+		exit 0
+	elif [ -z "${CLIENT_ID}" ]; then
+		echo "Service principal not found! Generating one @ ${SP_JSON}"
+		az ad sp create-for-rbac -n aks-images-packer${CREATE_TIME} -o json > ${SP_JSON}
+		CLIENT_ID=$(jq -r .appId ${SP_JSON})
+		CLIENT_SECRET=$(jq -r .password ${SP_JSON})
+		TENANT_ID=$(jq -r .tenant ${SP_JSON})
+	fi
 fi
 
 rg_id=$(az group show --name $AZURE_RESOURCE_GROUP_NAME) || rg_id=""
@@ -72,19 +74,21 @@ else
 	echo "storage account ${STORAGE_ACCOUNT_NAME} already exists."
 fi
 
-if [ -z "${CLIENT_ID}" ]; then
-	echo "CLIENT_ID was not set! Something happened when generating the service principal or when trying to read the sp file!"
-	exit 1
-fi
+if [ "$MODE" == "linuxVhdMode" ]; then
+	if [ -z "${CLIENT_ID}" ]; then
+		echo "CLIENT_ID was not set! Something happened when generating the service principal or when trying to read the sp file!"
+		exit 1
+	fi
 
-if [ -z "${CLIENT_SECRET}" ]; then
-	echo "CLIENT_SECRET was not set! Something happened when generating the service principal or when trying to read the sp file!"
-	exit 1
-fi
+	if [ -z "${CLIENT_SECRET}" ]; then
+		echo "CLIENT_SECRET was not set! Something happened when generating the service principal or when trying to read the sp file!"
+		exit 1
+	fi
 
-if [ -z "${TENANT_ID}" ]; then
-	echo "TENANT_ID was not set! Something happened when generating the service principal or when trying to read the sp file!"
-	exit 1
+	if [ -z "${TENANT_ID}" ]; then
+		echo "TENANT_ID was not set! Something happened when generating the service principal or when trying to read the sp file!"
+		exit 1
+	fi
 fi
 
 echo "storage name: ${STORAGE_ACCOUNT_NAME}"
@@ -385,16 +389,13 @@ private_packages_url=""
 if [ -n "${PRIVATE_PACKAGES_URL}" ]; then
 	echo "PRIVATE_PACKAGES_URL is set in pipeline variables: ${PRIVATE_PACKAGES_URL}"
 	private_packages_url="${PRIVATE_PACKAGES_URL}"
-fi
+fi 
 
 # windows_image_version refers to the version from azure gallery
 # aks_windows_image_version refers to the version built by AKS Windows SIG
 cat <<EOF > vhdbuilder/packer/settings.json
-{
+{ 
   "subscription_id":  "${SUBSCRIPTION_ID}",
-  "client_id": "${CLIENT_ID}",
-  "client_secret": "${CLIENT_SECRET}",
-  "tenant_id":      "${TENANT_ID}",
   "resource_group_name": "${AZURE_RESOURCE_GROUP_NAME}",
   "location": "${AZURE_LOCATION}",
   "storage_account_name": "${STORAGE_ACCOUNT_NAME}",
@@ -429,4 +430,10 @@ cat <<EOF > vhdbuilder/packer/settings.json
 }
 EOF
 
+if [ "$MODE" == "linuxVhdMode" ]; then
+	jq -r --arg key "client_id" --arg value "${CLIENT_ID}"  '. + { ($key) : $value}' < vhdbuilder/packer/settings.json > tmp.json && mv tmp.json vhdbuilder/packer/settings.json
+	jq -r --arg key "client_secret" --arg value "${CLIENT_SECRET}"  '. + { ($key) : $value}' < vhdbuilder/packer/settings.json > tmp.json && mv tmp.json vhdbuilder/packer/settings.json
+	jq -r --arg key "tenant_id" --arg value "${TENANT_ID}"  '. + { ($key) : $value}' < vhdbuilder/packer/settings.json > tmp.json && mv tmp.json vhdbuilder/packer/settings.json
+fi
+
 cat vhdbuilder/packer/settings.json
\ No newline at end of file
diff --git a/vhdbuilder/packer/kube-proxy-images.json b/vhdbuilder/packer/kube-proxy-images.json
index 6e9809ef0a0..bbf540dce24 100644
--- a/vhdbuilder/packer/kube-proxy-images.json
+++ b/vhdbuilder/packer/kube-proxy-images.json
@@ -6,8 +6,8 @@
         "downloadURL": "mcr.microsoft.com/oss/kubernetes/kube-proxy:v*",
         "amd64OnlyVersions": [],
         "multiArchVersions": [
-          "1.26.10-hotfix.20231103-1",
           "1.26.10-hotfix.20231103-5",
+          "1.26.10-hotfix.20231103-8",
           "1.26.12",
           "1.27.3-hotfix.20231102",
           "1.27.3-hotfix.20240125",
diff --git a/vhdbuilder/packer/windows-vhd-builder-sig.json b/vhdbuilder/packer/windows-vhd-builder-sig.json
index 22c9342b4d8..033a6d6c003 100644
--- a/vhdbuilder/packer/windows-vhd-builder-sig.json
+++ b/vhdbuilder/packer/windows-vhd-builder-sig.json
@@ -5,10 +5,7 @@
         "build_id": "{{env `BUILD_ID`}}",
         "build_number": "{{env `BUILD_NUMBER`}}",
         "build_repo": "{{env `GIT_REPO`}}",
-        "client_id": "{{env `AZURE_CLIENT_ID`}}",
-        "client_secret": "{{env `AZURE_CLIENT_SECRET`}}",
         "windows_sku": "{{env `WINDOWS_SKU`}}",
-        "tenant_id": "{{env `AZURE_TENANT_ID`}}",
         "subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
         "location": "{{env `AZURE_LOCATION`}}",
         "vm_size": "{{env `AZURE_VM_SIZE`}}",
@@ -26,9 +23,6 @@
     "builders": [
         {
             "type": "azure-arm",
-            "client_id": "{{user `client_id`}}",
-            "client_secret": "{{user `client_secret`}}",
-            "tenant_id": "{{user `tenant_id`}}",
             "subscription_id": "{{user `subscription_id`}}",
             "location": "{{user `location`}}",
             "vm_size": "{{user `vm_size`}}",