diff --git a/e2e/scenario/scenario_marinerv2.go b/e2e/scenario/scenario_marinerv2.go index 033221a9881..04ed6cc757c 100644 --- a/e2e/scenario/scenario_marinerv2.go +++ b/e2e/scenario/scenario_marinerv2.go @@ -16,6 +16,9 @@ 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 81b71761c49..82ce6b8837e 100644 --- a/e2e/scenario/scenario_ubuntu2204.go +++ b/e2e/scenario/scenario_ubuntu2204.go @@ -16,6 +16,9 @@ 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 87cd46134b8..75a2cbd3946 100644 --- a/e2e/scenario/validators.go +++ b/e2e/scenario/validators.go @@ -2,6 +2,7 @@ package scenario import ( "fmt" + "regexp" "strings" ) @@ -126,6 +127,42 @@ 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/parts/linux/cloud-init/artifacts/ensure-no-dup.sh b/parts/linux/cloud-init/artifacts/ensure-no-dup.sh index dbcc88d1f11..be883a28d54 100644 --- a/parts/linux/cloud-init/artifacts/ensure-no-dup.sh +++ b/parts/linux/cloud-init/artifacts/ensure-no-dup.sh @@ -35,8 +35,11 @@ if [[ -z "${bridgeIP}" ]]; then exit 1 fi -podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +# 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 echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early" exit 1 fi @@ -53,4 +56,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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData index 52ca3e10d47..576177fbcbf 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 656d2a94be5..969ba41b2c1 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 656d2a94be5..969ba41b2c1 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 2d77b601dbc..9097b9c1bc2 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 2d77b601dbc..9097b9c1bc2 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData index 52ca3e10d47..576177fbcbf 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index 27945c551a0..33d44e7e48a 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 2251cd1899e..9fa775a6cfe 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index 52ca3e10d47..576177fbcbf 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index bfc494a4e3f..69c6b85e9ad 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index 52ca3e10d47..576177fbcbf 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index ffceaafe1cf..6150d49646b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 04aaf38e3f1..876197e7439 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index ffceaafe1cf..6150d49646b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CustomData index 97207be5ce9..9d69f6d0b5c 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index 53520dd74af..69767cc3fac 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 95468925b49..479931de66c 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index c27ada7c364..afc9fc89f4f 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index f05bfebd8e2..a8f832e8774 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CustomData index 53520dd74af..69767cc3fac 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 53520dd74af..69767cc3fac 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 0a0fe0a67e9..4b200ab88db 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index b1b24226af5..cee12c6184b 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 975a935234b..18e8e063cde 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CustomData index 97207be5ce9..9d69f6d0b5c 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 95468925b49..479931de66c 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 2da6043d80d..c14316a731d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 86dcf465864..3523dfde0ca 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index a463f156089..146f0c171c5 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CustomData b/pkg/agent/testdata/AKSUbuntu2204+China/CustomData index 37613b629e9..33bfc7557ff 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData index ab5317d0058..9ded7c22d13 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData index 4132cf109bc..cc4ff682983 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData index b62560b1703..0c3ab1d10cc 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 62c610dea69..3b5a5fed0ba 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CustomData index 37613b629e9..33bfc7557ff 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CustomData index 37613b629e9..33bfc7557ff 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CustomData index 3622e4d2cc4..c1cc1c43950 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CustomData index 40b49fc4470..bb0c3891e7e 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CustomData index 97207be5ce9..9d69f6d0b5c 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CustomData index 37613b629e9..33bfc7557ff 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData b/pkg/agent/testdata/AzureLinuxV2+Kata/CustomData index a5e1f62316c..be22f87b9cb 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CustomData index a5e1f62316c..be22f87b9cb 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CustomData index a5e1f62316c..be22f87b9cb 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CustomData index a5e1f62316c..be22f87b9cb 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CustomData index a5e1f62316c..be22f87b9cb 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/CustomizedImage/CustomData b/pkg/agent/testdata/CustomizedImage/CustomData index 7daaac26d75..eaef3896af8 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/CustomizedImageKata/CustomData b/pkg/agent/testdata/CustomizedImageKata/CustomData index 7daaac26d75..eaef3896af8 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData b/pkg/agent/testdata/MarinerV2+CustomCloud/CustomData index e628047c45b..d6354cdb2e6 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/MarinerV2+Kata/CustomData b/pkg/agent/testdata/MarinerV2+Kata/CustomData index f7e2668f04b..e7bda06daf5 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CustomData index f7e2668f04b..e7bda06daf5 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CustomData index f7e2668f04b..e7bda06daf5 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CustomData index f7e2668f04b..e7bda06daf5 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CustomData index f7e2668f04b..e7bda06daf5 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index 52ca3e10d47..576177fbcbf 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index f18876546a7..77bd7fca90d 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/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 + 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== - 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 c606af08d4c..31251fb808d 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.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +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 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 \ No newline at end of file +#EOF diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 44bbfc84a7a..8d4f0db880a 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -4828,8 +4828,11 @@ if [[ -z "${bridgeIP}" ]]; then exit 1 fi -podSubnetAddr=$(cat /etc/cni/net.d/10-containerd-net.conflist | jq -r ".plugins[] | select(.type == \"bridge\") | .ipam.subnet") -if [[ -z "${podSubnetAddr}" ]]; then +# 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 echo "could not determine this node's pod ipam subnet range from 10-containerd-net.conflist...exiting early" exit 1 fi @@ -4846,7 +4849,8 @@ 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