Merge pull request #11237 from hakman/automated-cherry-pick-of-#11236…

…-upstream-release-1.20 Automated cherry pick of #11236: Add support for Docker v20.10.6
kubernetes · Apr 15, 2021 · 230c40b · 230c40b
2 parents a484b6e + c78cb60
commit 230c40b
Show file tree

Hide file tree

Showing 93 changed files with 139 additions and 124 deletions.
diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -282,7 +282,7 @@ Assets:
   - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
   - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
   - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-  - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
 ClusterName: bastionuserdata.example.com
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: master-us-test-1a

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -209,7 +209,7 @@ Assets:
   - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
   - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
   - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-  - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
 ClusterName: bastionuserdata.example.com
 ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 InstanceGroupName: nodes

diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -298,7 +298,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
     - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
     - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
     - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-    - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
   ClusterName: complex.example.com
   ConfigBase: memfs://clusters.example.com/complex.example.com
   InstanceGroupName: master-us-test-1a
@@ -574,7 +574,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
     - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
     - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
     - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-    - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
   ClusterName: complex.example.com
   ConfigBase: memfs://clusters.example.com/complex.example.com
   InstanceGroupName: nodes

diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -297,7 +297,7 @@ Assets:
   - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
   - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
   - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-  - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
 ClusterName: complex.example.com
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: master-us-test-1a

diff --git a/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@@ -209,7 +209,7 @@ Assets:
   - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
   - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
   - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-  - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
 ClusterName: complex.example.com
 ConfigBase: memfs://clusters.example.com/complex.example.com
 InstanceGroupName: nodes

diff --git a/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/...ompress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
@@ -148,7 +148,7 @@ echo "H4sIAAAAAAAA/+xW648bNRD/nr/CKqr6pbebvYYCq1Yi5AoXeldC0gcSqpBjTzYmXns7tvcuiD
 
 echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml
 
-echo "H4sIAAAAAAAA/8RW25LjthF911ewXOXyi0niRlxUfrCzW4m34nG21l/QABoSayhCASCNx1+fAinNSM46F2c3fqIEnO4+3X0awHc5Y8nbTdPAwUtRf7RNCEwwNijqhKNopJHIpQpDYIOQ0hoZrMSB0MA0oGcmCCosHZiAgXkE8u2+lGPe9n0uMcEOu12MuwnhOObOxUP/eLKYZiyY24QTQsb++j3TjpGO9Hac+2mcTz/3C6/FZMKy0INBm4EQFTingWjPkGiGljIxaCWFEWYYTODEOjdYBGTScR04MsUEk8x9JnquTAs9o5RmwnDmBymVU8AVgATurAVBKCEgteKorDcKNUdtUXOFHBUET0D/W3o6t5DKGMCV3Lp5fGVHOt2p3s1je5xOu3HO7UKyXUi263ZXdr+sPKUUVAvjrNJAgFLDGAfBlA/eUfCotaAMgzIUqKCGM8qcdhqZ8UIo+8JzN5b9yS7cXJwLjDMmf/vzwi/3Pj7NUwRf6yg60bs0tq+4mku7bNzS7gqkbqEM6XBVqFBgpRNM8eC4tcRZjc4MVDFFvaGDNsQNIC3BQVhmDEUFOliLSlkiUXxaCVRedwplAwohB62IM4ZKhdIJKSXj6HUgA1DPSLDOCu3ASqk1JYZrYwfmtZKMfyZ6V4UCUu6VHRwZrKeaIBg7WKmDENYDKBusoIQLYBiolzp4jZQNRhnlpWDhcyi0kvy1QiXyoAlqMVB0FpXlw2CYUIpRx5ExaVFaxjQ4AI+okHKpq4ljBDV9HfSr7jof3SOmheRanFygjK5+7IQ9QHJ7KfoV1jLSUdKRhc+b6ZQLph/hgNvGxcMxYc4d/gyH44TV4eZNnMO4+xNk3DYHPIQa2K1Wd8D+o9bv5lxgdviXFE/HNcoBqm17ym3BXFoK96APccJt87CANn9d1bdyWI7zOc7Ph3jK353KftsEmDJumsbtqunbNJ4xbZv8nAse/Mv6hxjLtunr/yme/PsUz6OvQHjKy+KSzdsff9o2lJBOiq5W6GYnHmCct9e/3RQdVMnhXMv7Fu1ptxvn3fcw+wlT3jYlnSorPI+ujHH+HpJfihfTcwdnGKdq9w0l5GH8eo4eQ75b/vK6ONZv/nNC/Gb48uvxALt/hl5X77CbptnHXGY44N/OmNLocdt89S085a82TbMMzVLS91Cr2J8h9dNor8PevwI2TTPF3Q94xmnbsE3TzFieYnp8v8j8Ipt5rBvR4w9gcVqu3TXIOszdGPu0dHVt/bJd4W1d7e6B9dxMcWqPE8y4bb744l+iV4cX2BznB8h/P2ECj2/evf1w007SLw09Rv8A8xgwl0vqWNzNudMfLrtVFwl3Y3X/k9ujPy0VvyrO7WGel1Tb/34oevA+zrm3MZZcEhzbi7vuGQ7TBot7Ifk7A7xkUdPzfVXv6vsTOMMzziWv7o4pllir966K8O651TR7yPttoyx3Kkjw1gOllqJTglhfn1vGaRGYMFYhoqYaghkC85xRIznRmokB9Nr+RWcv0ba0o6YjLUzHPXR8geR4Sg4v2mub6xH5cl53j3pRjB1nSCPm/jEec3/vqF9mKfcvgX59Vd96vnke3Ohn8frRh8FHArX/UaC6fzqeWZd5Bwf4Jc7wdLmQfkcKL6+Na4OkYYo4MI46MxCLcoAgCOcKfHAOHQHFtOEkAGdMWEs8Q60D1TRwg+D/4AbVdP4vDfrtQP9rg249rxf33fg/4vO2WZHHMWM6Y2r3CFPZuz26x3qqLUfZ65xebv/ftlmn9x8AAAD//wEAAP//k3ZvRiUNAAA=" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/8RW25LjthF911ewXOXyi0niflH5wc5uJd6Kx9laf0EDaEisoQgFgDQef32KpDQjxetcnN34iRJw0H26+3QD35WCtWw3TQOHoMT8o21iZIIxqakXnqJVViFXOsrIpFDKWRWdQkloZAYwMBsFFY5KJkCygEC+3dd6LNu+LzVl2GG3S2k3IhyH0vl06B9PDvOEFUubcUQo2F+/Z9ox0pHeDVM/DtPp537htRwZsS70QBorCdGRcxqJCQyJYegoE9JoJaywUtrIifNeOgRkynMTOTLNBFPMfyZ6vo4LPau1YcJyFqRS2mvgGkAB986BIJQQUEZz1C5YjYajcWi4Ro4aYiBg/i09U1rIdYjga2n9NLyyI53pdO+noT2Op90wlXYh2S4k23W7q7tfVp5KCWqE9U4bIECpZYyDYDrE4CkENEZQhlFbClRQyxll3niDzAYhtHvhuRvq/uQWbj5NFYYJc7j9eeFX+pCepjFBmPMoOtH7PLSvuDmWdtm4pd1VyN1CGfLhqlChwSkvmObRc+eIdwa9lVQzTYOl0ljiJShHUArHrKWowUTnUGtHFIpPK4GZ151CmUQhlDSaeGup0qi8UEoxjsFEIoEGRqLzThgPTiljKLHcWCdZMFox/pnoXRUKSHnQTnoiXaCGIFgnnTJRCBcAtItOUMIFMIw0KBODQcqk1VYHJVj8HAqdSf5KodY47pRSlnMZKdBgvNAyOu0ZpRgoCupZjFwzLS23yCTjSinvnQ6Wvs6hq+66kPwj5oXkmpxSoQ5+/rgRe4Ds90r0K6xlpKOkUwufN+OpVMw/wgG3jU+HY8ZSOvwZDscRZ4ObN2mKw+5PUHDbHPAQZ8d+PXUH7D96+t1UKkwe/5LT6bh6OcB8tj2VtmKpLYV70Ic04rZ5WECbv67qWzks43xK0/Mhncp3p7rfNhHGgpum8bv56Ns8nDFvm/JcKh7Cy/qHlOq26ef/YzqF9zmdhzAD4aksi0s0b3/8adtQQjolujlDNzvpAMO0vf7txuRhlhxOc3rfojvtdsO0+x6mMGIu26bm08wKz4OvQ5q+hxyW5KX83MEZhnE+9w0l5GH4ekoBY7lb/vK6OMzf8ueM+I388uvhALtfQ6+rd9hN0+xTqRMc8G9nzHkIuG2++haeylebplmaZknpe5iz2J8h9+Pgrs3evwI2TTOm3Q94xnHbsE3TTFifUn58v8j8IptpmDdSwB/A4bhcu6uTtZm7IfV5qepa+mV7hrfzancPnOdmTmN7HGHCbfPFF/8SvRq8wKY0PUD5+wkzBHzz7u2Hm3KSfinoMYUHmIaIpV5Cx+pv5k5/uOzOusi4G2bzP/k9htOS8avi/B6maQm1/e+boocQ0lR6l1ItNcOxvZjrnuEwbrD6F5K/08FLFHN4oZ/Vu9r+BMbwjFMtq7ljTjXN2Xs3i/DuudU0eyj7baMd9zoqCC4ApY6i14K4MD+3rDciMmGdRkRDDUQrIwucUas4MYYJCWYt/6KzF29b2lHbkRbG4x46vkBKOmWPF+21zXVEvszr7tEsinHDBHnA0j+mY+nvDfVLL5X+xdE/X9W3lm+eBzf6Wax+9GHwEUftf+Ro3j8dz6wrvIMD/JImeLpcSL8jhJfXxrVAyjJNPFhPvZXEoZIQBeFcQ4jeoyegmbGcROCMCedIYGhMpIZGbhHCH1ygOZz/S4F+29H/WqBby+vFfdf+j/i8bVbkcSiYz5jbPcJY936P/nGeassoe+3Ty+3/22fW7v0HAAAA//8BAAD//yp+IP4lDQAA" | base64 -d | gzip -d > conf/kube_env.yaml
 
 download-release
 echo "== nodeup node config done =="

diff --git a/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/...ion/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
@@ -148,7 +148,7 @@ echo "H4sIAAAAAAAA/6RUW2vbMBR+9684FEpfOtkOXdlECxsJo4W1C+njKEOxTlwRWcc9ktwF9uOHlF
 
 echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml
 
-echo "H4sIAAAAAAAA/7SV3Y7UNhvHz+cqIiTECUlsx58RB/CyegsqUESv4LH9eDYisae2Z5bt1VfJ7LA7baWqUjmK83zYv/z9t/OmFKxl3DUNLF7yddA2ITDOmFDUcUfRSCNxkCqIwASX0hoZrERBaGAa0DMTOOWWCsZBMI9AXt/Weihj35eaMuyx26e0nxEOU+lcWvqvR4s5YsXSZpwRCvaX54l2jHSkt1Ps5ykev/Ub19YyY93wQGgjCFFhGGgg2jMkmqGljAutJDfcCGHCQKxzwiIgk27QYUCmGGeSuR+E5+q84RmlNONmYF5IqZyCQQFIGJy1wAklBKRWAyrrjUI9oLaoB4UDKgiegP5HPF1ayHUK4GppXZwe6UinO9W7OLWH+bifYmk3yHaDbM/pru5/P3NKyanmxlmlgQClhrEBOFM+eEfBo9acMgzKUKCcmoFR5rTTyIznXNnvnPup3h7txuZSrDBFzP7p8IGv9D7dxTmBX3XkHe9dntrHuvVb2i3xFLurkLsNGfJycShXYKXjTA3BDdYSZzU6I6hiinpDhTbECZCWoOCWGUNRgQ7WolKWSOT/rQVWriuHMoGcS6EVccZQqVA6LqVkA3odiADqGQnWWa4dWCm1psQM2ljBvFaSDT8I7+JQQDp4ZYUjwnqqCYKxwkodOLceQNlgOSUDB4aBeqmD10iZMMooLzkLP8KhK+SfHSpxCJqg5oKis6jsIIRhXClG3YCMSYvSMqbBAXhEhXSQem1xjKCmjwf94rvOJ/cV8wZ5FqdUqJNbH3bGHiC7W8n7c1nLSEdJRzaet/OxVMyfYMGxcWk5ZCylw2+wHGZcJ9y9TTFM+/9BwbFZcAnrwu7cdVXY/233+1gqRIc/5XQ8nFeJyWO5TnxJM47Np+Rx9/PZb+dVtws8pni/pGN5c6y3YxNgLrhrGrdfG2/ydMI8NuW+VFz89/iXlOrY9Ov7nI7+c06nya+FcFe24MZ/8+nXsaGEdJJ3qyZPMmmBKY6X125ODlaTYVwFvUF73O+nuH8H0c+Yy9jUfFyp8DS5OqX4DrLf5Er5voMTTPPa94oS8nF6uQoQylX4+SU4ber8PyO+Es9fTgvs/1p6iV7V7prmNpUaYcFfTpjz5HFsXryGu/Ji1zTbMdkk/Qyriv0Jcj9P9nK8+8eCXdPMaf8BTziPDds1TcR6l/LXz5uxH4wSpzWRPH4Ai/P2oz0vcj6+3ZT6vO3pWrMl10G7xrrrsjU+Ns+ebfPFj1B+O2IGj2/f33x5sjmk37bnkPxHiFPAUh8+BKt7cm/0y0O27NwtxLixtf/etz14n2LpbUq11AyH9mG67h6WefcHAAAA//8BAAD//0Ho30RfCAAA" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/7SV247UOhaG7+spIiTEDZX4fIi4gKE1AxpgEPMEy/ZydURi19iuanqefpRUF90tRtra0uYqzjrYX37/dt7Viq2Ou66DJSixDvZdjEwwJjX1wlO0yirkSkcZmRRKOauiUygJjcwABmajoMJRyQRIFhDI29vWjnUchtpygQP2h5wPM8Jxqr3Py/D95LAkbFj3BWeEisP1eaY9Iz0Z3JSGeUqnH8PGtbXM2DY8kMZKQnTknEZiAkNiGDrKhDRaCSuslDZy4ryXDgGZ8txEjkwzwRTzvwnPt3nDs1obJixnQSqlvQauARRw7xwIQgkBZTRH7YLVaDgah4Zr5KghBgLmD/FM3UNpUwTf6t6n6ZGO9KbXg0/T/jifDlOq+w1yv0HuL+m+Hf574VRKUCOsd9oAAUotYxwE0yEGTyGgMYIyjNpSoIJazijzxhtkNgih3U/Ow9RuT25j8zk1mBKW8HT4wFeHkO/SnCGsOopeDL5M+8e69Vv2W+Ipdt+g9BsylOXqUKHBKS+Y5tFz54h3Br2VVDNNg6XSWOIlKEdQCsespajBROdQa0cUir/WAivXM4cyiUIoaTTx1lKlUXmhlGIcg4lEAg2MROedMB6cUsZQYrmxTrJgtGL8N+FdHQpIedBOeiJdoIYgWCedMlEIFwC0i05QwgUwjDQoE4NByqTVVgclWPwdDl0hf3GoNY47pZTlXEYKNBgvtIxOe0YpBoqCehYj10xLyy0yybhSynung6WP99DVd33I/juWDfIiTm3QJr8+3IwDQPG3SgyXsj0jPSW92njez6fasHyBBcfO5+VYsNYef8BynHGdcPc+pzgd/gYVx27BJa4L+0vXs8Lh/3Z/TLVB8viPkk/HyyopB6zPE9/yjGP3JQfc/fPit8uq2wWecrpf8qm+O7XbsYswV9x1nT+sjTdlOmMZu3pfGy7hZ/xbzm3shvV9zqfwteTzFNZCuKtbcOO/+fLvsaOE9Er0qyZPMnmBKY3X137OHlaTYVoFvUF3OhymdPgAKcxY6ti1clqp8Dz5NuX0AUrY5MrlvoczTPPa94YS8nl6vQoQ67Pwy2tw2tT5e0F8I1++nhY4/Fp6jT6r3XXdba4twYL/OmMpU8Cxe/UW7uqrXddtx2ST9CusKg5nKMM8uevxHh4Ldl0358MnPOM8dmzXdQnbXS7fv27GfjBKmtZEDvgJHM7bj/ayyOX49lMeyrana82WXAf7NdY/L1vjY/fixTZf+gz1PycsEPD9x5tvTzaHDNv2HHP4DGmKWNvDh2DzT+6NYXnI1p2/hZQ2tv2f9+0AIeRUB5dzq63Acf8wXX8Py7z7HwAAAP//AQAA//9h6tiZXwgAAA==" | base64 -d | gzip -d > conf/kube_env.yaml
 
 download-release
 echo "== nodeup node config done =="

diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml
@@ -301,7 +301,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
     - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
     - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
     - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-    - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
   ClusterName: containerd.example.com
   ConfigBase: memfs://clusters.example.com/containerd.example.com
   InstanceGroupName: master-us-test-1a
@@ -575,7 +575,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
     - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
     - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
     - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-    - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
   ClusterName: containerd.example.com
   ConfigBase: memfs://clusters.example.com/containerd.example.com
   InstanceGroupName: nodes

diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml
@@ -283,7 +283,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
     - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
     - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
     - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-    - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
   ClusterName: containerd.example.com
   ConfigBase: memfs://clusters.example.com/containerd.example.com
   InstanceGroupName: master-us-test-1a
@@ -539,7 +539,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
     - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
     - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
     - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-    - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
   ClusterName: containerd.example.com
   ConfigBase: memfs://clusters.example.com/containerd.example.com
   InstanceGroupName: nodes

diff --git a/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@@ -282,7 +282,7 @@ Assets:
   - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
   - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
   - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-  - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
 ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1a

diff --git a/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@@ -282,7 +282,7 @@ Assets:
   - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
   - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
   - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-  - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
 ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1b

diff --git a/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@@ -282,7 +282,7 @@ Assets:
   - 47ab6c4273fc3bb0cb8ec9517271d915890c5a6b0e54b2991e7a8fbbe77b06e4@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubelet
   - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl
   - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz
-  - 6e3f80e8451ecbe7b3559247721c3e226be6b228acaadee7e13683f80c20e81c@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz
+  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
 ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1c