diff --git a/parts/linux/cloud-init/artifacts/manifest.json b/parts/linux/cloud-init/artifacts/manifest.json index 6200e9ef7ba..3543362d846 100644 --- a/parts/linux/cloud-init/artifacts/manifest.json +++ b/parts/linux/cloud-init/artifacts/manifest.json @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh b/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh index 9fb2caa945e..569273a1e82 100755 --- a/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh +++ b/parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh @@ -127,6 +127,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData index 5054c0305bc..3b0931cdbf5 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData index 7a4d1f9f8fe..278239b3aaf 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData index 55707d417df..5c0cc8d4bb4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData index 55707d417df..5c0cc8d4bb4 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData index f2a0c021ff9..044b49f76da 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData index 7d12c9e04ff..eab3a1ca486 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData index 1545fc95f4c..776c7cd260e 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData index d5846e85522..20d1a65c370 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S115/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData index de5dd665293..e5ed6aecaa3 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S117/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData index 10503f7cb3b..d615764d2b6 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+K8S118/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData index 545c13c38bb..6c5b27579d6 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData index d5846e85522..20d1a65c370 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData index 44e94f28ed9..8f054f69e3d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData index 4554a1dd2da..5dbbe663ffa 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData index 38561af6564..3fe8600cd4c 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData index cbd5442fd66..9261a705460 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData index 67cddf389db..0eecc2639cb 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData index 65fda6750ba..e27a0617632 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData index 5c586e6499d..92cadeb5b6a 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData index 39610773288..3939748e516 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData index 6026054a398..d7643cd258c 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData index 6e351fcc71e..799c30de122 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData index e05b5bcf792..02ba531e8df 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData index 0bb821cbe9e..c90ffdd9fb0 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData index 680d9a83b62..4080b5738cf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData index 15446a92476..d51c917a5ec 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData index dfd1ec9c49c..900f7052c2f 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9w8eXPbNr7/61P8QmvqoyElOalfN13tjGIpjl99aCTZ7U63w4FIUEJNASwA+oit99nfACApnomVpNmdzR9JRQK/+wbYnRedOaGdORLLVgt7SwbWlMXcI3QBnsAuoUKiMHR9IiRnjlhCwDhczWMqY6vV4njFbvE5mz/s7cNjCwAARdJdYOlGMV9g6HXhB3jV7cKKzR9sTBeEYvPfXkha6xTCMaMSEYq5/yw4XrZcgUhoHOJIZLtJAL/9Bu09IgaT86PX+9DvQw9+//0nkEtM9RL15w4R6QaMuwpbyLwbkb1SEMBqP169vbqYXbmT0dloMB2tLQXJOjx0uq8tKINTfziW/MFb+S4J3ACRMObYpcwVEkkBvUPFx+EP4MU8BDsQ0zNYShmJN51OhLwbtMDCWRGPM8EC6Xhs1fEYDciiE2uRdyr0ZNvsbJsdceY7Pp7DP6AjV9FHlzw9Ab4nEtqjycQ9n7rjyeXQHY7eusPLXy7OLgdDd3Z6Prq8mmVM4lDgfyvHqziUBHFv+e15D0irIoL/aoUnDNfwCEeKs14X/OhmATb5Aszjn0/cwXDovhucnrVS518hfvPL4IzQ+H6wwFTCkoV+ITLEkY8kLoIdjGfu1Xg4mI0KbKRbVBhz42jBkV+zcXg6VbtPJoNhcfvbs8u3766mI/d6NJmeXl70rZ7z2nlt6Zch81AIl9PknX6W/eq39xYcR6BAT07fplqEDpZe58DmOMRI4CfwYgl2AIdg+2D1rf1WPgRl0JLo0zuqjT51VL5y/sdKFVkfGF+owPjdd2U8L3JRrohoByiDecjmQSwwJAoHQgHx1dFrMHYLHEcs2aAyhlJAbmm6vd9+LFO9/gl8lo/CLzLtJYEeXnWhB0fdLrRzYCuh+A8Wc4pCT4Zg25TZEVpgDnZc2JVbX7SF04vpbHB21hQBAHxGcUGyNWyiCHlLfGjHkoRCvbQlR1REjEtbRwHwkO1hLklAPCSxAA9HS9tjqxWj4C04iyM7JBKDRwKRgPEYpZIj7wY89XdI5jaPqSQrDHgu0TzEArBcSsZC0CpaEAmLMBYS80CovKu9SbIISKD/pkTa4kFIvLKXOIwwF0AokyR4sBUUAYTpdRFnscSHQCKBJZAoQfbHnxCSeYRWdnT3Z4xCIh/0g/RHAmTFYiqBKhIMfxFZfADBPCRBPIhAGPbEg1ChExSLWCME9cIOVSSA+w+JFCiWaqNPk20fSAScLgyunAl9tgFtZz7PMZ7EdLThrFstn93RkCH/ZHw15OQW862rF+2JiygGljrf9OerfF6KOS2Y6OrGJxzsCNqPJ+MrdziaztaN8f2VLrmUlJThLpTGE/HZSr80vreXGPmYC7u9F1O0wmDzfVh4HqzQDQb/ZiWqMbZONI3Yj7pp3jybZmkzFk4qOofeEp8gnTYlFiHqtDVf152L69Ph6cDW6cO+//HIPXptJ0xfrx0eU7BZXgodA8n2jSY2a4sc6IflPLkpQacnv36JKgmVOASxuM8U+jFlmmr91GBW9fr05Fcw9OcTUz4tfY2k5CGBoZ1AAmJosno/qlSxn9E7PfnVHU5Or0cT92py1rdS5WWa6/YcxhcdzbItFvcd30OR3XMOO9q09M/UXzEXSTk0xfwWc42sIxb3rl7r3h+9dg3jbs/pHbper9ft9g6dOaFWRtFPPyWUHn1LSo++gNKDHJVG2deYC8JoTvwCKJMg4kjlFOxbxYDUK8PEAnmtnHGMB8c/D05G076lXVb5rnJbA6ahOXperLAfsnDRTrFA0Zk2kp9WwkKOxs2yVlFf/fbeHAmsI0+7qMb9fGU2coenk36HRbKDPsQcd7L2UXQYLgdGs3zdauS1rqRvPxbxr014SWB18q/XzxeCdrflivmAvr9vAqdXbY1qOhtMZqbgXrdappIeRPIXIpfnaeU+vllsG8a+QdP8pd2T6kZCImTaK5UaFf2q2Klcvv2nTl1nqj34mt3w1+uDvzJTX9jm/gepKE2WtY6cNLBe1IxGp0QUyY5gMfew0E8dv/Nc/InflHk0bdyPhfYq8bRNtFc9829Kv3208o9ev9QVgfp7Gfz+KRknwjWZsmgoILGQql5YIUItJeMGHovysJNt+q2mdJ0Yycd4POxqHp+emt4f/uUyqDewryyFxGOabO0zPeUGP4gNAQ4SHjzBIlqAbfsY8RXjFRdx1OvypOVkfOL+PPpn/YhnK9fQ4DNRSa66Sl89rPrEJ9BuOcVZt1o7cDwdfX/9fggeouATT6qNcolhMw+GW1MivYRYqD7WZ3RXgoc4BiQgZHSh/iUS7hi/EVndLhH1Ucho3SD6+PJiNji9GE2G2WClbQqrHdD1hD2PSSghacIFLNEtBgTW9/qtBSIOAnIPhCpaCU9JBCE5oQsBe8TB0HNeOz2zY98BMxUHuUQSlphjx1ByNZmMLmYbMvZyjNsp2KRu98ECS5Xvr+AJBPZhVzzdPj3t5t5/r9/39gvAjy/Pz09nz4T9ej8RxK2mX9WjLOYQsjsscmVpxjILcrraDKTA/gBWu8RetVIo8291na7TtSoOuAN3GFB4hx4E+DhAcShBMm0pTg8iJL2lpohRUdbweDA7fr9B0H48fGP31lYrgctj6gHF2BcK4BynNS72ISBcSGBcZ01lyya83C433HsoFlgPcIKQeBLuiFzm5GGUjKmIOZ4oRO3HydXFcUrNG9uy1rAD+WdK4IgCiyRhFIXAbjHnxMda9CFRkicILpiP3zImheQoighdHOsMDCgiKWNKNspjbB8HhGI/m+tdTc40EiPNiHg3Ka8vAVFfb2RyiXlChIA77XJzDJIrAu5UWJdLZRkUgwowNULX/YHpv9qP9W/e9NdWLqW+UDbTtHZdrUwr3XLOvAPOVpp7IDSK5ZtmuFauYb/Du2GotgEqii4HOZWiZFk3lHuLb7VoWLxYApG7QgtTqHYmtRgkcgi1qKmybI6R/5CzPaZDC1Dm61goiI9VaDHwdDpTOjRhav6QKVuPLJdMqujEuM6IuXIvPdkrPdpEyOxF2ipvXr3jbKUsp1GQm44hPbybj42s1NZ3JMTFvcPRW/fd6dmo1NLkVjQNbJNDzdjzMPax36CKzzEBM5OBbqHQ3CGBki/HpjfP4XBTpWoMBuNkrBMVLBH3PeZvImXO0st2ns7JqzZek6n0QUXvlVW3phTrDq2SzDbqhHTwoIcNEfZIQLCvSFdWlobYhPQ39eTaJYnmcCcyLbQbhoQrjSDDCFWSPhtbqrA0qZwP/vdy4p6fXlxO+lZ7T+MvpyR4Aslh19mF3X9RlUmXGPlgUziEJ4iQkBhs4Tv7BsNwND2djIYNkCs0bwf8/WDqnkxGg9lokktXewKvbjE/ZqtIlTw1OdWqwWztW/nDIatdA9y08F1VqsN335llNaIzy9o1rFfOkVIdezHnmMowH9CqBZ1Sc5GXNaxUJscCVugPxp0VoYybnLokC5WRTKavtQ8HxA3RuRA+UgM6jYZJahNJjtYqSuuzYuuOUkoNiiUSMMeYZimfmgbKxB6xZHHomyoEUDII04ewgQqtKu4TqafMNwKu3w8F7M2xkDYOAsblfhE7ZXqXgIDFJuNTkPwBAiy9pZKADmXVFiZ/BlgIPGkwVwYbilKgT3qFqRlnla57uLWSPdi3ChOo31RpatXnjxoz/CZpqJIwIH+Y2JRDrz9mUOUclY9x/yaxf9hS7MaZ3iESmsysDFVi8JC3LEYBH8+t4s5thJ+T81+u6HJVkDvpq9XtM/rMzXS6SWNJFT/wfeWPjeNcEIR6GAZvAR/qEtB0D6Gv6p6VKlTT8KLDaEyriug5RyCYih5ZG5SyZ+JAOldRzu+kdFEfJmN9xKWxRHEYahJUFEORTCgGjlVP7Jk+Qje/EVdFsurgw1Ajq5+UqOb6eDpK0M1Ut5G1IV7SnzEOFN+ZaId0rf1gWvUSd4ZnDapZkIURRiaAwy68qlxR69c7z1aG5UVgoxDaj4PxzD0eHL830/7nuWmz2XSeTUSjFV9NzuosOBv5qJ5uOzMueeHsfNyvDVUK9M7OQad0gu3FPHR1ljOjtqNuseYpCqDi9LPz8dqqj42ms2ySWO2Qqz76bklN7oC5cNPyG08KoHYC5TPvRo+IcjMifbhsDfWbNKJYudnRSzN3qp1U1c6mTP2ip+ybxuZvTveV0ytcwtIrPtUFkQCKVXKlsnxjJ5MllWLzWNfPLmC1Z/oFCdRVsEQoYSGJuQp3FPYYB/xnjEKQbB8k4gssYY4EzgEpEFStY5WJ1NWtNUVnY3jLVhiBnp32S2hLed9KXh+fnSZnfa+crlO9OlYCqlfletNcmi7f2DGRVXl07iJxmaqD7GZxP0fQQU1AbjCU9QHYNgpDdmeraKevCYqao566EG1S/cYnMzfVXlgacZWfZcOtmkmcnjn+5eO4wlStTN5z5mmazJoxSgXWRt+bhKAXVVNBJr5NIiiD22SAwuIk0lbhdhIQm+iaK9waM0huk6kK62RUsJMC5kqR+N8+PfxYlV2SZFVqnzHJ+wzjq53ezQaTk9GsXH/n5nDFBTV+UYJg9UyIKwXMT16kMDpT5KfaFMAC0NAg1AljRRZLqSdycwzoFpEQzUN97dR8ngGD8+HR645Go6txQHJjI5KscAmbYNoefRIEWCW0NP+k5qT0vXmJuLdUKkC3jPiAggB7uu7HyFsmIciPtR1FnN0SBYHQRQFlg6xK6aDx5nLzFZTfajSlT9xVVre597fD5Ej6o4t+aMhfO8Bo+GCyijI8W9Ntzu7snhm6CKUHI/rchWig7O6laoM2hCjX2WCsGRc0ieN4fOUOJsfv++29BZbH46sB95b7ADv6oFyB3dwgrJZt2mHyNVsybOxlh4UdvSRd0OnsFu+kl0uZZPBXlmj1EM94cWJamQxz9U1ZJzrdlWJWtexRKdcpe3f+ZFCPslRQhNulnxzZ6m70ZXJ05y2xd6MW3eHd22wGoRwmnZvlzisDaF+/H7pnlydTHcfGg9n7CqtZpBsPZrPR5KJvZfy6ZT47dudf/7dOjOhAdXKJftdOYfZRzHDtvYBQPwuqhSEO2PIhwhCATfQVOSsXehOC1qoqF4xLsK/hCSQiobKB/dppWjFuf8Yc7bMDfyVcF90BPl0vKpH360X+6ZKvlrZ1q+WFGNGrqOb+Nl+BPQmgnV4vzh4GjddM0vvHumUwt0vWrdY81Df8hbxg8S1GcYZBYmxArZgfcTbHjt/JFtvUrHY8RgP4B3R8fNuhcRjC3/8+uny3gQrJwlZaLCa/YcV8LLDsd1tqPTz7UovpKGxCieRoFQiw45oL1A3XHdetFvL9Cy2IQSQnOGKF+4faDp8vv6bQU12ZxRcTunWEpthUGIajjwUW03oml6b77b1QzN3kF9gcbLG/hQBrPhNL7rgviFzGc4ewIqudRbS4wQ9N94JQJNP95XtBH1MFbHf9t3xdqIi1/rrQX0XMVxGqydntx0SP6xrzSiVc8ybl7FuwhmQjGc132r6Y5uLlrfx00LhvNiOcmEtRmR9vWr7xaHI+uNA3jtJ5pvGq6mdUbfM1R1rITwtfiCXrXH04lR5t1ABP51Ltxxz0tdt+TIBn0wB3dnl59vOpThNreII7D+ywdNQBVruAd3M62njIkf9sSFftpsB4mY3PCV0UjzgaxstWkYP+Jzg4sLbztPRPw8h5O/EdNKhiW4Lyn059jtITg8+65/SLuTr6J1cXCv2mAC2awFbqL2ScCvZPm0GDCTQBrLOFMjsH20u/wRS+RKhfwzDMxC2p+D4Rdz4enrbEu2WEqs+Y6SeI6efT7ccagZTcbUvdZe7yJRQ0aXkLWspaMicDmW5MAWU6wnTkYp75QvatTix4R/9O8pbKd1b+8qgPVtsXshPdLKoumFWO6ZLOcPT2dHChvwLiLKyP2VmnqYKLSrLN25MQc126IrsLu/rjuf1iUE/Ch+E2aZozZPW0bAKJanqhkLwPU0pfQnIMsemkc6cRyUWZpOtOsVewlCYOUPd9CyStDM+JtAgpN8avfh3TuLM03sgKBb3ULItisfTzD7QwX2jtOsWi5tBtPxou1y4KQ91DV4T7vC/ZsthbRNC3MgxbZtiE04a6b6eIxxyR6wuCwPGfMeF4pbTMKJgFtodfwh2GP2Ihk65liWFOKOIPZiRKJAimluB7yZEn1YMVojEKwwdzQq8igO3jOdgT+LQg8962FeMqj3DIHEn59QHof7aDw1cVKg8UYcZIWKT/rzA7o8t3/x8AAP//y+WIpd5GAAA= + H4sIAAAAAAAA/9w8eXPbNr7/61P8QmvqoyElOa5fN13tjGIpjl99jSS73el2OBAJSqgpgAVAH7H1PvsbACTFM7GcNLuz/sOpSeB33wC79aozI7QzQ2LRamFvwcCasJh7hM7BE9glVEgUhq5PhOTMEQsIGIerWUxlbLVaHC/ZLT5js4edXXhsAQCgSLpzLN0o5nMMvS78AG+6XViy2YON6ZxQbP7bC0lrlUI4YlQiQjH3nwXHy5YrEAmNQxyJbDcJ4LffoL1DxGB8dniwC/0+9OD3338CucBUL1E/d4hIN2DcVdhC5t2I7JWCAFb78erd1fn0yh2PTkeDyWhlKUjW/r7TPbCgDE79cCz5g7f0XRK4ASJhzLFLmSskkgJ6+4qP/R/Ai3kIdiAmp7CQMhJvO50IeTdojoWzJB5nggXS8diy4zEakHkn1iLvVOjJttnZNjvizHd8PIN/QEcuo08ueXoCfE8ktEfjsXs2cS/HF0N3OHrnDi9+OT+9GAzd6cnZ6OJqmjGJQ4H/rRwv41ASxL3Ft+c9IK2KCP6rFZ4wXMMjHCrOel3wo5s52OQLMF/+fOwOhkP3/eDktJU6/xLxm18Gp4TG94M5phIWLPQLkSGOfCRxEezgcupeXQ4H01GBjXSLCmNuHM058ms2Dk8mavfxeDAsbn93evHu/dVk5F6PxpOTi/O+1XMOnANLvwyZh0K4mCTv9LPsr357Z85xBAr0+ORdqkXoYOl19myOQ4wEfgIvlmAHsA+2D1bf2m3lQ1AGLYk+vcPa6FNH5Rvnf6xUkfWB8ZUKjN99V8bzKhflioi2gDKYhWwWxAJDonAgFBBfHh6AsVvgOGLJBpUxlAJyS9Pt/fZjmerVT+CzfBR+lWkvCfTwpgs9OOx2oZ0DWwnFf7CYUxR6MgTbpsyO0BxzsOPCrtz6oi2cnE+mg9PTpggA4DOKC5KtYRNFyFvgfTuWJBTqpS05oiJiXNo6CoCHbA9zSQLiIYkFeDha2B5bLhkFb85ZHNkhkRg8EogEjMcolRx5N+Cp3yGZ2Tymkiwx4JlEsxALwHIhGQtBq2hOJMzDWEjMA6HyrvYmySIggf5NibTFg5B4aS9wGGEugFAmSfBgKygCCNPrIs5iifeBRAJLIFGC7I8/ISSzCC3t6O7PGIVEPugH6R8JkCWLqQSqSDD8RWT+EQTzkATxIAJh2BMPQoVOUCxijRDUCztUkQDuPyZSoFiqjT5Ntn0kEXA6N7hyJvRiA9rMfJ5jPInpaMNZtVo+u6MhQ/7x5dWQk1vMN65etCfOoxhY6nyTn6/yeSnmtGCiyxufcLAjaD8eX165w9FkumqM7290yaWkpAx3rjSeiM9W+qXxvb3AyMdc2O2dmKIlBpvvwtzzYIluMPg3S1GNsXWiacR+2E3z5ukkS5uxcFLROfSW+ATptCmxCFGnrfm67pxfnwxPBrZOH/b9j4fu4YGdMH29cnhMwWZ5KXQMJNs3mlivLXKgH5bz5LoEnRz/+iWqJFTiEMT8PlPop5RpqvUTg1nV65PjX8HQn09M+bT0NZKShwSGdgIJiKHJ6v2oUsVuRu/k+Fd3OD65Ho3dq/Fp30qVl2mu23MYn3c0y7aY33d8D0V2z9nvaNPSf6b+irlIyqEJ5reYa2QdMb939Vr3/vDANYy7Pae373q9Xrfb23dmhFoZRT/9lFB6+C0pPfwCSvdyVBplX2MuCKM58QugTIKII5VTsG8VA1KvDBML5LVyxnE5OPp5cDya9C3tssp3ldsaMA3N0fNihf2QhYt2igWKzrSW/KQSFnI0rpe1ivrqt3dmSGAdedpFNe7mK7OROzwZ9zsskh30Mea4k7WPosNwOTCa5atWI691JX37sYh/ZcJLAquTf716vhC0uy2WzAf0/X0TOL1qY1ST6WA8NQX3qtUylfQgkr8QuThLK/fLm/mmYewbNM1f2j2pbiQkQqa9UqlR0a+KncrFu3/q1HWq2oOv2Q1/vT74KzP1hW3uf5CK0mRZ68hJA+tFzWh0SkSR7AgWcw8L/dTxO8/Fn/hNmUfTxv1YaK8ST1tHe9Uz/6b020dL//Dgta4I1O9F8PvnZJwI12TKoqGAxEKqemGJCLWUjBt4LMrDTrbpt5rSVWIkn+Jxv6t5fHpqer//l8ug3sC+shQSj2mytRd6yg1+EGsCHCQ8eIJ5NAfb9jHiS8YrLuKo1+VJy/Hlsfvz6J/1I56NXEODz0QlueoqffWw6hOfQbvhFGfVam3B0WT0/fWHIXiIgk88qTbKBYb1PBhuTYn0GmKh+lif0W0JHuIYkICQ0bn6l0i4Y/xGZHW7RNRHIaN1g+ii9fTbO6GYuUmNDDYHW+zm1x1dDEfng7PKQi9beHRxPh2cnI/Gw2xS0zaV2hboAsWexSSUkHT1AhboFgMC63v91gIRBwG5B0IV84SnPIOQnNC5gB3iYOg5B07P7Nh1wIzZQS6QhAXm2DGUXI3Ho/PpmoydnCTtFGzSCPhggaX6gTfwBAL7sC2ebp+etnPvv9fve7sF4EcXZ2cn02fCPthNBHGr6VcFLos5hOwOi1ydm7HMgpzy1xMusD+C1S6xVy09yvxbXafrdK2KR2/BHQYU3qEHAT4OUBxKkEybntODCElvoSliVJQ1fDmYHn1YI2g/7r+1eyurlcDlMfWAYuwLBXCG06IZ+xAQLiQwrtOwcg4Tr24Xa+49FAusJ0JBSDwJd0QucvIwSsZUxByPFaL24/jq/Cil5q1tWSvYgvwzJXBEgUWSMIpCYLeYc+JjLfqQKMkTBOfMx+8Yk0JyFEWEzo90SgcUkZQxJRvlgraPA0Kxnw0Kr8anGomRZkS8m5TX14CorzcyucA8IULAnfbhGQbJFQF3Kk/IhbIMikFFrBqh64bDNHTtx/o3b/srK5ejXymbaVq7qpa6lfY7Z94BZ0vNPRAaxfJtM1wrNwG4w9thqLYBKoouBzmVomRZe5V7i2+1aFg8XwCR20ILU6j+KLUYJHIItaipsmyOkf+Qsz2mQwtQ5uvgKoiPVWgx8HR+VDo0YWr2kClbz0AXTKroxLhOsbn6MT0qLD1ah9zsRdp7r1+952ypLKdRkOsWJD0NnF0aWamt70mIi3uHo3fu+5PTUalHyq1omgAnp6Sx52HsY79BFS8xATPkgW6hct0igZIvx6bZz+FwU6VqDAbj+FJnPlgg7nvMX0fKnKWX7TwdvFdtvCZT6ZOP3hurbk0p1u1bJZmt1QnpJENPLyLskYBgX5GurCwNsQnpb+vJtUsSzeFOZFroXwwJVxpBhhGqJL0YW6qwNKmcDf73YuyenZxfjPtWe0fjL6ckeALJYdvZhu1/UZVJFxj5YFPYhyeIkJAYbOE7uwbDcDQ5GY+GDZArNG8G/MNg4h6PR4PpaJxLVzsCL28xP2LLSNVQNTnVqsFs7Vr50yarXQPczAS6qvaH774zy2pEZ5a1a1ivHEylOvZizjGVYT6gVStEpeYiLytYqkyOBSzRH4w7S0IZNzl1QeYqI5lMX2sfDogbonMhfKKodBoNk9QmkhytVZTWi2LrllJKDYoFEjDDmGYpn5qOzMQesWBx6JsqBFAyWdOnuoEKrSruE6nH1jcCrj8MBezMsJA2DgLG5W4RO2V6l4CAxSbjU5D8AQIsvYWSgA5l1Z4of6hYCDxpMFcGG4pSoE+aj4mZj5Xuj7i1kt3btQojrd9UaWrV548aM/wmaaiSMCB/OtmUQ68/ZVDlHJWPcf8msX/cUOzGmd4jEprMrAxVYvCQtyhGAR/PrOLOTYSfk/NfruhyVZA7OqzVbda4NveZ63F3k8aSKn7g+8ofG+fDIAj1MAzeAd7XJaDpHkJf1T1LVaim4UWH0ZhWFdFzDkEwFT2yNihlz8SBdFCjnN9J6aI+jC/1mZnGEsVhqElQUQxFMqEYOFY9sWf6CN38RlwVyRI8FIYaWf3oRTXXR5NRgm6quo2sDfGS/oxxoPjORDuka+0H06qXuDM8a1DNgizMRDIB7HfhTeXOW7/eeTYyLC8CG4XQfhxcTt2jwdEHc3zwPDdtNpvOs4lotOKr8WmdBWczJNXTbWbGJS+cnl32a0OVAr21tdcpHYl7MQ9dneXM7O6wW6x5igKoOP307HJl1cdG01k2Sax2alYffTekJndiXbi6+Y0nBVA7gfKZd6NHRLkZkT6ttob6TRpRrNzs6LWZO9VOqmpnU6Z+0WP7dWPzN6f7xukVbnXpFZ/rgkgAxSq5Ulm+tZPJkkqxeayrZxew2jP9ggTqKlgilLCQxFyFOwo7jAP+M0YhSLYLEvE5ljBDAueAFAiq1rHKROrq1pqiszG8ZSuMQE9P+iW0pbxvJa+PTk+Sw8M3Ttep3kUrAdWrcr1pLk2XrwCZyKo8OnczuUzVXnZVuZ8jaK8mIDcYymoPbBuFIbuzVbTT9w5FzdlRXYg2qX7tk5mbai8sjbjKz7LhVs0kTs8c//JxXGGqVibvOfM0TWbNGKUCa63vdULQi6qpIBPfOhGUwa0zQGFxEmmrcDsJiHV0zRVujRkkt8lUhXUyKthJAXOlSPxvnx5+qsouSbIqtRdM8l5gfLXTu+lgfDyaluvv3ByuuKDGL0oQrJ4JcaWA+dmbGUZnivxUmwJYABoahDphLMl8IfVEboYB3SISolmo77Ga7z1gcDY8POhoNLoaByTXNiLJEpewCabt0SdBgFVCS/NPak5K3+uXiHsLpQJ0y4gPKAiwp+t+jLxFEoL8WNtRxNktURAInRdQNsiqlA4ar0I332n5rUZT+ghfZXWbe3/bT864P7noh4b8tQWMhg8mqyjDszXd5uzO7pmhi1B6MKLP3bAGyu5eqzZoTYhynTXGmnFBkziOLq/cwfjoQ7+9M8fy6PJqwL3FLsCWPnlXYNdXEqtlm3aYfM2WDBt72WFhRy9JF3Q628VL7uVSJhn8lSVaPcQzXpyYVibDXH1T1olOd6WYVS17VMp1yt6dPxnUoywVFOF24SdHtrobfZ0c3XkL7N2oRXd4+zabQSiHSedmufPKANrXH4bu6cXxRMexy8H0Q4XVLNJdDqbT0fi8b2X8umU+O3bnX/+3SoxoT3VyiX5XTmH2Ucxw7Z2AUD8LqoUhDtjyIcIQgE30nTsrF3oTglaqKheMS7Cv4QkkIqGygd3aaVoxbr9gjvbiwF8J10V3gM/Xi0rk/XqRf77kq6Vt1Wp5IUb0Kqq5EM6XYI8DaKf3lbOHQeO9lfRCs24ZzHWVVas1C/UnA0Kes/gWozjDIDE2oJbMjzibYcfvZIttalY7HqMB/AM6Pr7t0DgM4e9/H128X0OFZGErLRaTv2HJfCyw7Hdbaj08+5aM6ShsQonkaBkIsOOaG9kN9ydXrRby/XMtiEEkxzhihQuN2g6fL7+m0FNdmcUXE7p1hKbYVBiGo08FFtN6JhdHmu+bvPi7s+TS/JzIRTxzCCuy2plH8xv80HTRCEUy3V++aPQpVcBm94nL94+KWOvvH/1VxHwVoZqc3X5M9LiqMa9UwjVvUs6+BWtINpLRfEnui2ku3gbLTweN+2YzwrG5FJX58brluxyNzwbn+sZROs80XlX9LqttPg9JC/lJ4ZOzZJ2rD6fSo40a4Olcqv2Yg75y248J8Gwa4E4vLk5/PtFpYgVPcOeBHZaOOsBqF/CuT0cbDzny3yHpqt0UGK+z8Tmh8+IRR8N42Spy0P8MB3vWZp6W/jSMnDcT316DKjYlKP8t1kuUnhh81j2nn+DV0T++Olfo1wVo0QQ2Un8h41Swf94MGkygCWCdLZTZ2dtc+g2m8CVC/RqGYSZuScX3mbjz6fC0Id4NI1R9xky/aUy/x24/1gik5G4b6i5zly+hoEnLG9BS1pI5Gch0Ywoo0xGmIxfzzBeyb3ViwTv67yRvqXxn5S+P+mC1fSE70c286oJZ5Zgu6QxH704G5/qzIs7C+piddZoquKgk27w9CTHXpSuy27Ctv8bbLQb1JHwYbpOmOUNWT8s6kKimFwrJez+l9DUkxxDrTjp3GpFclEm67hR7BUtp4gB1H8xA0srwnEiLkHJj/OrnNo07S+ONrFDQS82yKBYLP/9AC/OV1q5TLGr23faj4XLlojDUPXRFuM/7NC6LvUUEfSvDsGGGTThtqPu2injMEbm+IAgc/xkTjpdKy4yCWWB7+DXcYfgjFjLpWhYYZoQi/mBGokSCYGoJvpcceVI9WCIaozB8MCf0KgLYPp6BPYbPCzLvbRsxrvIIh8yRlF/vgf5nMzh8WaFyTxFmjIRF+n8zszW6eP//AQAA///LJzW9L0cAAA== - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData index 39610773288..3939748e516 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData index 10503f7cb3b..d615764d2b6 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData index 52510034d02..a447f66ff91 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/9w8eXPbNr7/61P8QmvqoyElOalfN13tjGIpjl99aCTZ7U63w4FIUEJNASwA+oit99nfACApnomVpNmdzR9JRQK/+wbYnRedOaGdORLLVgt7SwbWlMXcI3QBnsAuoUKiMHR9IiRnjlhCwDhczWMqY6vV4njFbvE5mz/s7cNjCwAARdJdYOlGMV9g6HXhB3jV7cKKzR9sTBeEYvPfXkha6xTCMaMSEYq5/yw4XrZcgUhoHOJIZLtJAL/9Bu09IgaT86PX+9DvQw9+//0nkEtM9RL15w4R6QaMuwpbyLwbkb1SEMBqP169vbqYXbmT0dloMB2tLQXJOjx0uq8tKINTfziW/MFb+S4J3ACRMObYpcwVEkkBvUPFx+EP4MU8BDsQ0zNYShmJN51OhLwbtMDCWRGPM8EC6Xhs1fEYDciiE2uRdyr0ZNvsbJsdceY7Pp7DP6AjV9FHlzw9Ab4nEtqjycQ9n7rjyeXQHY7eusPLXy7OLgdDd3Z6Prq8mmVM4lDgfyvHqziUBHFv+e15D0irIoL/aoUnDNfwCEeKs14X/OhmATb5Aszjn0/cwXDovhucnrVS518hfvPL4IzQ+H6wwFTCkoV+ITLEkY8kLoIdjGfu1Xg4mI0KbKRbVBhz42jBkV+zcXg6VbtPJoNhcfvbs8u3766mI/d6NJmeXl70rZ7z2nlt6Zch81AIl9PknX6W/eq39xYcR6BAT07fplqEDpZe58DmOMRI4CfwYgl2AIdg+2D1rf1WPgRl0JLo0zuqjT51VL5y/sdKFVkfGF+owPjdd2U8L3JRrohoByiDecjmQSwwJAoHQgHx1dFrMHYLHEcs2aAyhlJAbmm6vd9+LFO9/gl8lo/CLzLtJYEeXnWhB0fdLrRzYCuh+A8Wc4pCT4Zg25TZEVpgDnZc2JVbX7SF04vpbHB21hQBAHxGcUGyNWyiCHlLfGjHkoRCvbQlR1REjEtbRwHwkO1hLklAPCSxAA9HS9tjqxWj4C04iyM7JBKDRwKRgPEYpZIj7wY89XdI5jaPqSQrDHgu0TzEArBcSsZC0CpaEAmLMBYS80CovKu9SbIISKD/pkTa4kFIvLKXOIwwF0AokyR4sBUUAYTpdRFnscSHQCKBJZAoQfbHnxCSeYRWdnT3Z4xCIh/0g/RHAmTFYiqBKhIMfxFZfADBPCRBPIhAGPbEg1ChExSLWCME9cIOVSSA+w+JFCiWaqNPk20fSAScLgyunAl9tgFtZz7PMZ7EdLThrFstn93RkCH/ZHw15OQW862rF+2JiygGljrf9OerfF6KOS2Y6OrGJxzsCNqPJ+MrdziaztaN8f2VLrmUlJThLpTGE/HZSr80vreXGPmYC7u9F1O0wmDzfVh4HqzQDQb/ZiWqMbZONI3Yj7pp3jybZmkzFk4qOofeEp8gnTYlFiHqtDVf152L69Ph6cDW6cO+//HIPXptJ0xfrx0eU7BZXgodA8n2jSY2a4sc6IflPLkpQacnv36JKgmVOASxuM8U+jFlmmr91GBW9fr05Fcw9OcTUz4tfY2k5CGBoZ1AAmJosno/qlSxn9E7PfnVHU5Or0cT92py1rdS5WWa6/YcxhcdzbItFvcd30OR3XMOO9q09M/UXzEXSTk0xfwWc42sIxb3rl7r3h+9dg3jbs/pHbper9ft9g6dOaFWRtFPPyWUHn1LSo++gNKDHJVG2deYC8JoTvwCKJMg4kjlFOxbxYDUK8PEAnmtnHGMB8c/D05G076lXVb5rnJbA6ahOXperLAfsnDRTrFA0Zk2kp9WwkKOxs2yVlFf/fbeHAmsI0+7qMb9fGU2coenk36HRbKDPsQcd7L2UXQYLgdGs3zdauS1rqRvPxbxr014SWB18q/XzxeCdrflivmAvr9vAqdXbY1qOhtMZqbgXrdappIeRPIXIpfnaeU+vllsG8a+QdP8pd2T6kZCImTaK5UaFf2q2Klcvv2nTl1nqj34mt3w1+uDvzJTX9jm/gepKE2WtY6cNLBe1IxGp0QUyY5gMfew0E8dv/Nc/InflHk0bdyPhfYq8bRNtFc9829Kv3208o9ev9QVgfp7Gfz+KRknwjWZsmgoILGQql5YIUItJeMGHovysJNt+q2mdJ0Yycd4POxqHp+emt4f/uUyqDewryyFxGOabO0zPeUGP4gNAQ4SHjzBIlqAbfsY8RXjFRdx1OvypOVkfOL+PPpn/YhnK9fQ4DNRSa66Sl89rPrEJ9BuOcVZt1o7cDwdfX/9fggeouATT6qNcolhMw+GW1MivYRYqD7WZ3RXgoc4BiQgZHSh/iUS7hi/EVndLhH1Ucho3SD6+PJiNji9GE2G2WClbQqrHdD1hD2PSSghacIFLNEtBgTW9/qtBSIOAnIPhCpaCU9JBCE5oQsBe8TB0HNeOz2zY98BMxUHuUQSlphjx1ByNZmMLmYbMvZyjNsp2KRu98ECS5Xvr+AJBPZhVzzdPj3t5t5/r9/39gvAjy/Pz09nz4T9ej8RxK2mX9WjLOYQsjsscmVpxjILcrraDKTA/gBWu8RetVIo8291na7TtSoOuAN3GFB4hx4E+DhAcShBMm0pTg8iJL2lpohRUdbweDA7fr9B0H48fGP31lYrgctj6gHF2BcK4BynNS72ISBcSGBcZ01lyya83C433HsoFlgPcIKQeBLuiFzm5GGUjKmIOZ4oRO3HydXFcUrNG9uy1rAD+WdK4IgCiyRhFIXAbjHnxMda9CFRkicILpiP3zImheQoighdHOsMDCgiKWNKNspjbB8HhGI/m+tdTc40EiPNiHg3Ka8vAVFfb2RyiXlChIA77XJzDJIrAu5UWJdLZRkUgwowNULX/YHpv9qP9W/e9NdWLqW+UDbTtHZdrUwr3XLOvAPOVpp7IDSK5ZtmuFauYb/Du2GotgEqii4HOZWiZFk3lHuLb7VoWLxYApG7QgtTqHYmtRgkcgi1qKmybI6R/5CzPaZDC1Dm61goiI9VaDHwdDpTOjRhav6QKVuPLJdMqujEuM6IuXIvPdkrPdpEyOxF2ipvXr3jbKUsp1GQm44hPbybj42s1NZ3JMTFvcPRW/fd6dmo1NLkVjQNbJNDzdjzMPax36CKzzEBM5OBbqHQ3CGBki/HpjfP4XBTpWoMBuNkrBMVLBH3PeZvImXO0st2ns7JqzZek6n0QUXvlVW3phTrDq2SzDbqhHTwoIcNEfZIQLCvSFdWlobYhPQ39eTaJYnmcCcyLbQbhoQrjSDDCFWSPhtbqrA0qZwP/vdy4p6fXlxO+lZ7T+MvpyR4Aslh19mF3X9RlUmXGPlgUziEJ4iQkBhs4Tv7BsNwND2djIYNkCs0bwf8/WDqnkxGg9lokktXewKvbjE/ZqtIlTw1OdWqwWztW/nDIatdA9y08F1VqsN335llNaIzy9o1rFfOkVIdezHnmMowH9CqBZ1Sc5GXNaxUJscCVugPxp0VoYybnLokC5WRTKavtQ8HxA3RuRA+UgM6jYZJahNJjtYqSuuzYuuOUkoNiiUSMMeYZimfmgbKxB6xZHHomyoEUDII04ewgQqtKu4TqafMNwKu3w8F7M2xkDYOAsblfhE7ZXqXgIDFJuNTkPwBAiy9pZKADmXVFiZ/BlgIPGkwVwYbilKgT3qFqRlnla57uLWSPdi3ChOo31RpatXnjxoz/CZpqJIwIH+Y2JRDrz9mUOUclY9x/yaxf9hS7MaZ3iESmsysDFVi8JC3LEYBH8+t4s5thJ+T81+u6HJVkDvpq9XtM/rMzXS6SWNJFT/wfeWPjeNcEIR6GAZvAR/qEtB0D6Gv6p6VKlTT8KLDaEyriug5RyCYih5ZG5SyZ+JAOldRzu+kdFEfJmN9xKWxRHEYahJUFEORTCgGjlVP7Jk+Qje/EVdFsurgw1Ajq5+UqOb6eDpK0M1Ut5G1IV7SnzEOFN+ZaId0rf1gWvUSd4ZnDapZkIURRiaAwy68qlxR69c7z1aG5UVgoxDaj4PxzD0eHL830/7nuWmz2XSeTUSjFV9NzuosOBv5qJ5uOzMueeHsfNyvDVUK9M7OQad0gu3FPHR1ljOjtqNuseYpCqDi9LPz8dqqj42ms2ySWO2Qqz76bklN7oC5cNPyG08KoHYC5TPvRo+IcjMifbhsDfWbNKJYudnRSzN3qp1U1c6mTP2ip+ybxuZvTveV0ytcwtIrPtUFkQCKVXKlsnxjJ5MllWLzWNfPLmC1Z/oFCdRVsEQoYSGJuQp3FPYYB/xnjEKQbB8k4gssYY4EzgEpEFStY5WJ1NWtNUVnY3jLVhiBnp32S2hLed9KXh+fnSZnfa+crlO9OlYCqlfletNcmi7f2DGRVXl07iJxmaqD7GZxP0fQQU1AbjCU9QHYNgpDdmeraKevCYqao566EG1S/cYnMzfVXlgacZWfZcOtmkmcnjn+5eO4wlStTN5z5mmazJoxSgXWRt+bhKAXVVNBJr5NIiiD22SAwuIk0lbhdhIQm+iaK9waM0huk6kK62RUsJMC5kqR+N8+PfxYlV2SZFVqnzHJ+wzjq53ezQaTk9GsXH/n5nDFBTV+UYJg9UyIKwXMT16kMDpT5KfaFMAC0NAg1AljRRZLqSdycwzoFpEQzUN97dR8ngGD8+HR645Go6txQHJjI5KscAmbYNoefRIEWCW0NP+k5qT0vXmJuLdUKkC3jPiAggB7uu7HyFsmIciPtR1FnN0SBYHQRQFlg6xK6aDx5nLzFZTfajSlT9xVVre597fD5Ej6o4t+aMhfO8Bo+GCyijI8W9Ntzu7snhm6CKUHI/rchWig7O6laoM2hCjX2WCsGRc0ieN4fOUOJsfv++29BZbH46sB95b7ADv6oFyB3dwgrJZt2mHyNVsybOxlh4UdvSRd0OnsFu+kl0uZZPBXlmj1EM94cWJamQxz9U1ZJzrdlWJWtexRKdcpe3f+ZFCPslRQhNulnxzZ6m70ZXJ05y2xd6MW3eHd22wGoRwmnZvlzisDaF+/H7pnlydTHcfGg9n7CqtZpBsPZrPR5KJvZfy6ZT47dudf/7dOjOhAdXKJftdOYfZRzHDtvYBQPwuqhSEO2PIhwhCATfQVOSsXehOC1qoqF4xLsK/hCSQiobKB/dppWjFuf8Yc7bMDfyVcF90BPl0vKpH360X+6ZKvlrZ1q+WFGNGrqOb+Nl+BPQmgnV4vzh4GjddM0vvHumUwt0vWrdY81Df8hbxg8S1GcYZBYmxArZgfcTbHjt/JFtvUrHY8RgP4B3R8fNuhcRjC3/8+uny3gQrJwlZaLCa/YcV8LLDsd1tqPTz7UovpKGxCieRoFQiw45oL1A3XHdetFvL9Cy2IQSQnOGKF+4faDp8vv6bQU12ZxRcTunWEpthUGIajjwUW03oml6b77b1QzN3kF9gcbLG/hQBrPhNL7rgviFzGc4ewIqudRbS4wQ9N94JQJNP95XtBH1MFbHf9t3xdqIi1/rrQX0XMVxGqydntx0SP6xrzSiVc8ybl7FuwhmQjGc132r6Y5uLlrfx00LhvNiOcmEtRmR9vWr7xaHI+uNA3jtJ5pvGq6mdUbfM1R1rITwtfiCXrXH04lR5t1ABP51Ltxxz0tdt+TIBn0wB3dnl59vOpThNreII7D+ywdNQBVruAd3M62njIkf9sSFftpsB4mY3PCV0UjzgaxstWkYP+Jzg4sLbztPRPw8h5O/EdNKhiW4Lyn059jtITg8+65/SLuTr6J1cXCv2mAC2awFbqL2ScCvZPm0GDCTQBrLOFMjsH20u/wRS+RKhfwzDMxC2p+D4Rdz4enrbEu2WEqs+Y6SeI6efT7ccagZTcbUvdZe7yJRQ0aXkLWspaMicDmW5MAWU6wnTkYp75QvatTix4R/9O8pbKd1b+8qgPVtsXshPdLKoumFWO6ZLOcPT2dHChvwLiLKyP2VmnqYKLSrLN25MQc126IrsLu/rjuf1iUE/Ch+E2aZozZPW0bAKJanqhkLwPU0pfQnIMsemkc6cRyUWZpOtOsVewlCYOUPd9CyStDM+JtAgpN8avfh3TuLM03sgKBb3ULItisfTzD7QwX2jtOsWi5tBtPxou1y4KQ91DV4T7vC/ZsthbRNC3MgxbZtiE04a6b6eIxxyR6wuCwPGfMeF4pbTMKJgFtodfwh2GP2Ihk65liWFOKOIPZiRKJAimluB7yZEn1YMVojEKwwdzQq8igO3jOdgT+LQg8962FeMqj3DIHEn59QHof7aDw1cVKg8UYcZIWKT/rzA7o8t3/x8AAP//y+WIpd5GAAA= + H4sIAAAAAAAA/9w8eXPbNr7/61P8QmvqoyElOa5fN13tjGIpjl99jSS73el2OBAJSqgpgAVAH7H1PvsbACTFM7GcNLuz/sOpSeB33wC79aozI7QzQ2LRamFvwcCasJh7hM7BE9glVEgUhq5PhOTMEQsIGIerWUxlbLVaHC/ZLT5js4edXXhsAQCgSLpzLN0o5nMMvS78AG+6XViy2YON6ZxQbP7bC0lrlUI4YlQiQjH3nwXHy5YrEAmNQxyJbDcJ4LffoL1DxGB8dniwC/0+9OD3338CucBUL1E/d4hIN2DcVdhC5t2I7JWCAFb78erd1fn0yh2PTkeDyWhlKUjW/r7TPbCgDE79cCz5g7f0XRK4ASJhzLFLmSskkgJ6+4qP/R/Ai3kIdiAmp7CQMhJvO50IeTdojoWzJB5nggXS8diy4zEakHkn1iLvVOjJttnZNjvizHd8PIN/QEcuo08ueXoCfE8ktEfjsXs2cS/HF0N3OHrnDi9+OT+9GAzd6cnZ6OJqmjGJQ4H/rRwv41ASxL3Ft+c9IK2KCP6rFZ4wXMMjHCrOel3wo5s52OQLMF/+fOwOhkP3/eDktJU6/xLxm18Gp4TG94M5phIWLPQLkSGOfCRxEezgcupeXQ4H01GBjXSLCmNuHM058ms2Dk8mavfxeDAsbn93evHu/dVk5F6PxpOTi/O+1XMOnANLvwyZh0K4mCTv9LPsr357Z85xBAr0+ORdqkXoYOl19myOQ4wEfgIvlmAHsA+2D1bf2m3lQ1AGLYk+vcPa6FNH5Rvnf6xUkfWB8ZUKjN99V8bzKhflioi2gDKYhWwWxAJDonAgFBBfHh6AsVvgOGLJBpUxlAJyS9Pt/fZjmerVT+CzfBR+lWkvCfTwpgs9OOx2oZ0DWwnFf7CYUxR6MgTbpsyO0BxzsOPCrtz6oi2cnE+mg9PTpggA4DOKC5KtYRNFyFvgfTuWJBTqpS05oiJiXNo6CoCHbA9zSQLiIYkFeDha2B5bLhkFb85ZHNkhkRg8EogEjMcolRx5N+Cp3yGZ2Tymkiwx4JlEsxALwHIhGQtBq2hOJMzDWEjMA6HyrvYmySIggf5NibTFg5B4aS9wGGEugFAmSfBgKygCCNPrIs5iifeBRAJLIFGC7I8/ISSzCC3t6O7PGIVEPugH6R8JkCWLqQSqSDD8RWT+EQTzkATxIAJh2BMPQoVOUCxijRDUCztUkQDuPyZSoFiqjT5Ntn0kEXA6N7hyJvRiA9rMfJ5jPInpaMNZtVo+u6MhQ/7x5dWQk1vMN65etCfOoxhY6nyTn6/yeSnmtGCiyxufcLAjaD8eX165w9FkumqM7290yaWkpAx3rjSeiM9W+qXxvb3AyMdc2O2dmKIlBpvvwtzzYIluMPg3S1GNsXWiacR+2E3z5ukkS5uxcFLROfSW+ATptCmxCFGnrfm67pxfnwxPBrZOH/b9j4fu4YGdMH29cnhMwWZ5KXQMJNs3mlivLXKgH5bz5LoEnRz/+iWqJFTiEMT8PlPop5RpqvUTg1nV65PjX8HQn09M+bT0NZKShwSGdgIJiKHJ6v2oUsVuRu/k+Fd3OD65Ho3dq/Fp30qVl2mu23MYn3c0y7aY33d8D0V2z9nvaNPSf6b+irlIyqEJ5reYa2QdMb939Vr3/vDANYy7Pae373q9Xrfb23dmhFoZRT/9lFB6+C0pPfwCSvdyVBplX2MuCKM58QugTIKII5VTsG8VA1KvDBML5LVyxnE5OPp5cDya9C3tssp3ldsaMA3N0fNihf2QhYt2igWKzrSW/KQSFnI0rpe1ivrqt3dmSGAdedpFNe7mK7OROzwZ9zsskh30Mea4k7WPosNwOTCa5atWI691JX37sYh/ZcJLAquTf716vhC0uy2WzAf0/X0TOL1qY1ST6WA8NQX3qtUylfQgkr8QuThLK/fLm/mmYewbNM1f2j2pbiQkQqa9UqlR0a+KncrFu3/q1HWq2oOv2Q1/vT74KzP1hW3uf5CK0mRZ68hJA+tFzWh0SkSR7AgWcw8L/dTxO8/Fn/hNmUfTxv1YaK8ST1tHe9Uz/6b020dL//Dgta4I1O9F8PvnZJwI12TKoqGAxEKqemGJCLWUjBt4LMrDTrbpt5rSVWIkn+Jxv6t5fHpqer//l8ug3sC+shQSj2mytRd6yg1+EGsCHCQ8eIJ5NAfb9jHiS8YrLuKo1+VJy/Hlsfvz6J/1I56NXEODz0QlueoqffWw6hOfQbvhFGfVam3B0WT0/fWHIXiIgk88qTbKBYb1PBhuTYn0GmKh+lif0W0JHuIYkICQ0bn6l0i4Y/xGZHW7RNRHIaN1g+ii9fTbO6GYuUmNDDYHW+zm1x1dDEfng7PKQi9beHRxPh2cnI/Gw2xS0zaV2hboAsWexSSUkHT1AhboFgMC63v91gIRBwG5B0IV84SnPIOQnNC5gB3iYOg5B07P7Nh1wIzZQS6QhAXm2DGUXI3Ho/PpmoydnCTtFGzSCPhggaX6gTfwBAL7sC2ebp+etnPvv9fve7sF4EcXZ2cn02fCPthNBHGr6VcFLos5hOwOi1ydm7HMgpzy1xMusD+C1S6xVy09yvxbXafrdK2KR2/BHQYU3qEHAT4OUBxKkEybntODCElvoSliVJQ1fDmYHn1YI2g/7r+1eyurlcDlMfWAYuwLBXCG06IZ+xAQLiQwrtOwcg4Tr24Xa+49FAusJ0JBSDwJd0QucvIwSsZUxByPFaL24/jq/Cil5q1tWSvYgvwzJXBEgUWSMIpCYLeYc+JjLfqQKMkTBOfMx+8Yk0JyFEWEzo90SgcUkZQxJRvlgraPA0Kxnw0Kr8anGomRZkS8m5TX14CorzcyucA8IULAnfbhGQbJFQF3Kk/IhbIMikFFrBqh64bDNHTtx/o3b/srK5ejXymbaVq7qpa6lfY7Z94BZ0vNPRAaxfJtM1wrNwG4w9thqLYBKoouBzmVomRZe5V7i2+1aFg8XwCR20ILU6j+KLUYJHIItaipsmyOkf+Qsz2mQwtQ5uvgKoiPVWgx8HR+VDo0YWr2kClbz0AXTKroxLhOsbn6MT0qLD1ah9zsRdp7r1+952ypLKdRkOsWJD0NnF0aWamt70mIi3uHo3fu+5PTUalHyq1omgAnp6Sx52HsY79BFS8xATPkgW6hct0igZIvx6bZz+FwU6VqDAbj+FJnPlgg7nvMX0fKnKWX7TwdvFdtvCZT6ZOP3hurbk0p1u1bJZmt1QnpJENPLyLskYBgX5GurCwNsQnpb+vJtUsSzeFOZFroXwwJVxpBhhGqJL0YW6qwNKmcDf73YuyenZxfjPtWe0fjL6ckeALJYdvZhu1/UZVJFxj5YFPYhyeIkJAYbOE7uwbDcDQ5GY+GDZArNG8G/MNg4h6PR4PpaJxLVzsCL28xP2LLSNVQNTnVqsFs7Vr50yarXQPczAS6qvaH774zy2pEZ5a1a1ivHEylOvZizjGVYT6gVStEpeYiLytYqkyOBSzRH4w7S0IZNzl1QeYqI5lMX2sfDogbonMhfKKodBoNk9QmkhytVZTWi2LrllJKDYoFEjDDmGYpn5qOzMQesWBx6JsqBFAyWdOnuoEKrSruE6nH1jcCrj8MBezMsJA2DgLG5W4RO2V6l4CAxSbjU5D8AQIsvYWSgA5l1Z4of6hYCDxpMFcGG4pSoE+aj4mZj5Xuj7i1kt3btQojrd9UaWrV548aM/wmaaiSMCB/OtmUQ68/ZVDlHJWPcf8msX/cUOzGmd4jEprMrAxVYvCQtyhGAR/PrOLOTYSfk/NfruhyVZA7OqzVbda4NveZ63F3k8aSKn7g+8ofG+fDIAj1MAzeAd7XJaDpHkJf1T1LVaim4UWH0ZhWFdFzDkEwFT2yNihlz8SBdFCjnN9J6aI+jC/1mZnGEsVhqElQUQxFMqEYOFY9sWf6CN38RlwVyRI8FIYaWf3oRTXXR5NRgm6quo2sDfGS/oxxoPjORDuka+0H06qXuDM8a1DNgizMRDIB7HfhTeXOW7/eeTYyLC8CG4XQfhxcTt2jwdEHc3zwPDdtNpvOs4lotOKr8WmdBWczJNXTbWbGJS+cnl32a0OVAr21tdcpHYl7MQ9dneXM7O6wW6x5igKoOP307HJl1cdG01k2Sax2alYffTekJndiXbi6+Y0nBVA7gfKZd6NHRLkZkT6ttob6TRpRrNzs6LWZO9VOqmpnU6Z+0WP7dWPzN6f7xukVbnXpFZ/rgkgAxSq5Ulm+tZPJkkqxeayrZxew2jP9ggTqKlgilLCQxFyFOwo7jAP+M0YhSLYLEvE5ljBDAueAFAiq1rHKROrq1pqiszG8ZSuMQE9P+iW0pbxvJa+PTk+Sw8M3Ttep3kUrAdWrcr1pLk2XrwCZyKo8OnczuUzVXnZVuZ8jaK8mIDcYymoPbBuFIbuzVbTT9w5FzdlRXYg2qX7tk5mbai8sjbjKz7LhVs0kTs8c//JxXGGqVibvOfM0TWbNGKUCa63vdULQi6qpIBPfOhGUwa0zQGFxEmmrcDsJiHV0zRVujRkkt8lUhXUyKthJAXOlSPxvnx5+qsouSbIqtRdM8l5gfLXTu+lgfDyaluvv3ByuuKDGL0oQrJ4JcaWA+dmbGUZnivxUmwJYABoahDphLMl8IfVEboYB3SISolmo77Ga7z1gcDY8POhoNLoaByTXNiLJEpewCabt0SdBgFVCS/NPak5K3+uXiHsLpQJ0y4gPKAiwp+t+jLxFEoL8WNtRxNktURAInRdQNsiqlA4ar0I332n5rUZT+ghfZXWbe3/bT864P7noh4b8tQWMhg8mqyjDszXd5uzO7pmhi1B6MKLP3bAGyu5eqzZoTYhynTXGmnFBkziOLq/cwfjoQ7+9M8fy6PJqwL3FLsCWPnlXYNdXEqtlm3aYfM2WDBt72WFhRy9JF3Q628VL7uVSJhn8lSVaPcQzXpyYVibDXH1T1olOd6WYVS17VMp1yt6dPxnUoywVFOF24SdHtrobfZ0c3XkL7N2oRXd4+zabQSiHSedmufPKANrXH4bu6cXxRMexy8H0Q4XVLNJdDqbT0fi8b2X8umU+O3bnX/+3SoxoT3VyiX5XTmH2Ucxw7Z2AUD8LqoUhDtjyIcIQgE30nTsrF3oTglaqKheMS7Cv4QkkIqGygd3aaVoxbr9gjvbiwF8J10V3gM/Xi0rk/XqRf77kq6Vt1Wp5IUb0Kqq5EM6XYI8DaKf3lbOHQeO9lfRCs24ZzHWVVas1C/UnA0Kes/gWozjDIDE2oJbMjzibYcfvZIttalY7HqMB/AM6Pr7t0DgM4e9/H128X0OFZGErLRaTv2HJfCyw7Hdbaj08+5aM6ShsQonkaBkIsOOaG9kN9ydXrRby/XMtiEEkxzhihQuN2g6fL7+m0FNdmcUXE7p1hKbYVBiGo08FFtN6JhdHmu+bvPi7s+TS/JzIRTxzCCuy2plH8xv80HTRCEUy3V++aPQpVcBm94nL94+KWOvvH/1VxHwVoZqc3X5M9LiqMa9UwjVvUs6+BWtINpLRfEnui2ku3gbLTweN+2YzwrG5FJX58brluxyNzwbn+sZROs80XlX9LqttPg9JC/lJ4ZOzZJ2rD6fSo40a4Olcqv2Yg75y248J8Gwa4E4vLk5/PtFpYgVPcOeBHZaOOsBqF/CuT0cbDzny3yHpqt0UGK+z8Tmh8+IRR8N42Spy0P8MB3vWZp6W/jSMnDcT316DKjYlKP8t1kuUnhh81j2nn+DV0T++Olfo1wVo0QQ2Un8h41Swf94MGkygCWCdLZTZ2dtc+g2m8CVC/RqGYSZuScX3mbjz6fC0Id4NI1R9xky/aUy/x24/1gik5G4b6i5zly+hoEnLG9BS1pI5Gch0Ywoo0xGmIxfzzBeyb3ViwTv67yRvqXxn5S+P+mC1fSE70c286oJZ5Zgu6QxH704G5/qzIs7C+piddZoquKgk27w9CTHXpSuy27Ctv8bbLQb1JHwYbpOmOUNWT8s6kKimFwrJez+l9DUkxxDrTjp3GpFclEm67hR7BUtp4gB1H8xA0srwnEiLkHJj/OrnNo07S+ONrFDQS82yKBYLP/9AC/OV1q5TLGr23faj4XLlojDUPXRFuM/7NC6LvUUEfSvDsGGGTThtqPu2injMEbm+IAgc/xkTjpdKy4yCWWB7+DXcYfgjFjLpWhYYZoQi/mBGokSCYGoJvpcceVI9WCIaozB8MCf0KgLYPp6BPYbPCzLvbRsxrvIIh8yRlF/vgf5nMzh8WaFyTxFmjIRF+n8zszW6eP//AQAA///LJzW9L0cAAA== - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData index 52510034d02..a447f66ff91 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData index 869d4c6a51d..7dd26adefdd 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData index 585ed1b47ff..59f1d1a12af 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData index 672d9a32404..22274a2a8bf 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData index 7e6d24c5741..9c16bde4dfa 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804+krustlet/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData index 8e4507fe26d..7494292cfae 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData index e20cc6dfe00..367cfc428f1 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData index 39a54e41ee2..d9b421e0c01 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh +++ b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/RawUbuntu/CustomData b/pkg/agent/testdata/RawUbuntu/CustomData index d875afc988b..332e3b2e62f 100644 --- a/pkg/agent/testdata/RawUbuntu/CustomData +++ b/pkg/agent/testdata/RawUbuntu/CustomData @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= - path: /opt/azure/containers/provision_cis.sh diff --git a/pkg/agent/testdata/RawUbuntu/line77.sh b/pkg/agent/testdata/RawUbuntu/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/RawUbuntu/line77.sh +++ b/pkg/agent/testdata/RawUbuntu/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CustomData b/pkg/agent/testdata/RawUbuntuContainerd/CustomData index 3ada31f39ef..75c29bc28d2 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/CustomData +++ b/pkg/agent/testdata/RawUbuntuContainerd/CustomData @@ -59,7 +59,7 @@ write_files: encoding: gzip owner: root content: !!binary | - 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 - path: /opt/azure/containers/provision_configs.sh @@ -74,7 +74,7 @@ write_files: encoding: gzip owner: root content: !!binary | - H4sIAAAAAAAA/8SUXW/aMBSG7/kVUcbdZpsUOm3cUZqpaFWosjJpmqrISU47a8FG/oCtKP99sgkkUApbtYrb874+n0+ybHme5/mZ4JoyDjL3+94q5uL3rICITsHve/5UpL9RbUzay+E4uh2MojC+TL6G8ZfROCrf0kcjAW1pN4Pb4dXGgXNI/Xd1iVwseCFofi0yqpngthQRM03qUmTtUfseTuJr++aH1jPVJ8S2idNCpDgTEvCC8VwsFOagnUR2xiAHxiApE5xlpGDc/LLz3kySQTy8KneTHNyFSQ3XJviAOz1zYC/N/Ls7moNUTHDl973vm6hTAtzDQRd1G+4q/h73UM/fRO8a6SB/cBddmxpSQTUovRLPcRCgs6aqNE2L6mlV14nlyuNLw7MjAFlL0l7Gk2j4FBoXfSEuNvH/B8Vl3dvuETj+dc6Xnr+DO0hmH8+eAlAp5/sZYFxpWhSw/cGv9gX31BQVBB3crROUW9fmc5YzWn8GdmbN3K2fIeDYIQ9c7bl93O1rKZfMek7YyE+TguSg4XWaWDNMM4WmTEohsWPLftmO4Lo+mbeXDrXwMvk8uQiTi1E0iL9twCMp41QyUI03iIsckCMbNbnUVOKHx7/bQKJhOrO/k1NcoVW23oTjT60/AQAA//9usiuA3wYAAA== + H4sIAAAAAAAA/8SUT2/aMBjG73yKKOO22S6FThq3AJ6KxkKVkknTVEVO4nbWgo1sB7ZG+e6TTUgCBbpVm3p9n8fv319SdBzHcdxEcE0YpzJ1h842ZuP3LKM+WVJ36LhLEf8CjTHqFuO5v/CmPg4m0Rcc3E7nfvmWPOaSgj3txluMr2sHTGnsvmtKpGLDM0HSmUiIZoKbUkisNGpKoZ1HHXsYBjPz5rvWKzVEyLQJ40zEMBGSwg3jqdgoyKm2EjoYA50ZA3WLcBT6izAazyfY9z7jEmWM5z/N7Ddh5AXj6/Iw4dm95HHOdV6nDfAMe7e4zM/sq13rcHdrKhUTXLlD51sdtUoPDmCvD/otdxV/Dwdg4NbRu1Y6mj7YS+9MLSkjmiq9Fa9grwcu26rSJM6qp1VdK5ZbjytznjwDlrFE3SII/fFTmGz0hRiZxP8eIJv1aLsoZoKz5BQofzvnS89/AS+ATD5cPgWgUq6OM8C40iTL6P6PYLsvek/yrILgAvabBOXetfmapYw0n4SZWTN76xMEPHfIM1c7tY+7Yy2lkhnPKzbyI4+p5FTT/9PEjmGSKLBkUgoJLVvmy7YEN/XRultY1PAk+hSOcDSa+l7wtQYPxYwTyahqvQFcpBRYskGbS00kfHj8sw1Emi5X5nfyGlfolJ03eP6x8zsAAP//rLLohvcGAAA= - path: /opt/azure/containers/provision_cis.sh diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line62.sh b/pkg/agent/testdata/RawUbuntuContainerd/line62.sh index b01d36ce253..5f502ef9f2d 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line62.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line62.sh @@ -125,6 +125,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/pkg/agent/testdata/RawUbuntuContainerd/line77.sh b/pkg/agent/testdata/RawUbuntuContainerd/line77.sh index 6200e9ef7ba..3543362d846 100644 --- a/pkg/agent/testdata/RawUbuntuContainerd/line77.sh +++ b/pkg/agent/testdata/RawUbuntuContainerd/line77.sh @@ -2,7 +2,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" diff --git a/pkg/templates/templates_generated.go b/pkg/templates/templates_generated.go index 44ada2efd5e..d6c2289a6f2 100644 --- a/pkg/templates/templates_generated.go +++ b/pkg/templates/templates_generated.go @@ -3189,7 +3189,7 @@ var _linuxCloudInitArtifactsManifestJson = []byte(`{ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4" @@ -4721,6 +4721,8 @@ updateAptWithMicrosoftPkg() { # CSE+VHD can dictate the containerd version, users don't care as long as it works installStandaloneContainerd() { + UBUNTU_RELEASE=$(lsb_release -r -s) + UBUNTU_CODENAME=$(lsb_release -c -s) CONTAINERD_VERSION=$1 # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here. CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1) diff --git a/schemas/manifest.cue b/schemas/manifest.cue index 85ec370b316..12544badb57 100644 --- a/schemas/manifest.cue +++ b/schemas/manifest.cue @@ -49,7 +49,7 @@ "containerd": { "fileName": "moby-containerd_${CONTAINERD_VERSION}+azure-${CONTAINERD_PATCH_VERSION}.deb", "downloadLocation": "/opt/containerd/downloads", - "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/bionic/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu18.04u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", + "downloadURL": "https://moby.blob.core.windows.net/moby/moby-containerd/${CONTAINERD_VERSION}+azure/${UBUNTU_CODENAME}/linux_${CPU_ARCH}/moby-containerd_${CONTAINERD_VERSION}+azure-ubuntu${UBUNTU_RELEASE}u${CONTAINERD_PATCH_VERSION}_${CPU_ARCH}.deb", "versions": [ "1.4.13-3", "1.6.4-4"