Merge pull request #11681 from hakman/automated-cherry-pick-of-#11674…

…-upstream-release-1.20 Automated cherry pick of #11674: Add support for Docker v20.10.7
kubernetes · Jun 6, 2021 · a581465 · a581465
2 parents c91065c + 246c703
commit a581465
Show file tree

Hide file tree

Showing 93 changed files with 123 additions and 120 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
-  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+  - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+  - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+    - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+    - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+  - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+  - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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/+xW3Y8bNRB/z19hFVV96e1mr0eBVSsRcoULvSsh6QcSqpBjTzYmXns7tvcuiD
 
 echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml
 
-echo "H4sIAAAAAAAA/8RW25LjthF911ewXOXyi0niflH5wc5uJd6Kx9laf0EDaEisoQgFgDQef32KpDQjOetcnN34iRJw0H26+3QD35WCtWw3TQOHoMT8o21iZIIxqakXnqJVViFXOsrIpFDKWRWdQkloZAYwMBsFFY5KJkCygEC+3dd6LNu+LzVl2GG3S2k3IhyH0vl06B9PDvOEFUubcUQo2F+/Z9ox0pHeDVM/DtPp537htRwZsS70QBorCdGRcxqJCQyJYegoE9JoJaywUtrIifNeOgRkynMTOTLNBFPMfyZ6vo4LPau1YcJyFqRS2mvgGkAB986BIJQQUEZz1C5YjYajcWi4Ro4aYiBg/i09U1rIdYjga2n9NLyyI53pdO+noT2Op90wlXYh2S4k23W7q7tfFp4KUGjFpTXeSsOjcZIoIiO1QXmNFqPlnlGliRJKouYheiMQlVMcGH/luRvq/uQWbj5NFYYJc7j9eeFX+pCepjFBmPMoOtX7PLSvuDmWdtm4pd1VyN1CGfLhqlChwSkvmObRc+eIdwa9lVQzTYOl0ljiJShHUArHrKWowUTnUGtHFIpPK4GZ151CmUQhlDSaeGup0qi8UEoxjsFEIoEGRqLzThgPTiljKLHcWCdZMFox/pnoXRUKSHnQTnoiXaCGIFgnnTJRCBcAtItOUMIFMIw0KBODQcqk1VYHJVj8HAqdSf5aodYax51SynIuIwUajBdaRqc9oxQDRUE9i5FrpqXlFplkXCnlvdPB0tc5dNVdF5J/xLyQXJNTKtTBzx83Yg+Q/V6JfoW1jHSUdGrh82Y8lYr5RzjgtvHpcMxYSoc/w+E44mxw8yZNcdj9CQpumwMe4uzYr6fugP1HT7+bSoXJ419yOh1XLweYz7an0lYstaVwD/qQRtw2Dwto89dVfSuHZZxPaXo+pFP57lT32ybCWHDTNH43H32bhzPmbVOeS8VDeFn/kFLdNv38f0yn8D6n8xBmIDyVZXGJ5u2PP20bSkinRDdn6GYnHWCYtte/3Zg8zJLDaU7vW3Sn3W6Ydt/DFEbMZdvUfJpZ4XnwdUjT95DDkryUnzs4wzDO576hhDwMX08pYCx3y19eF4f5W/6cEb+RX349HGD3z9Dr6h120zT7VOoEB/zbGXMeAm6br76Fp/LVpmmWpllS+h7mLPZnyP04uGuz96+ATdOMafcDnnHcNmzTNBPWp5Qf3y8yv8hmGuaNFPAHcDgu1+7qZG3mbkh9Xqq6ln7ZnuHtvNrdA+e5mdPYHkeYcNt88cW/RK8GL7ApTQ9Q/n7CDAHfvHv74aacpF8KekzhAaYhYqmX0LH6m7nTHy67sy4y7obZ/E9+j+G0ZPyqOL+HaVpCbf/7pughhDSV3qVUS81wbC/mumc4jBus/oXk73TwEsUcXuhn9a62P4ExPONUy2rumFNNc/bezSK8e241zR7Kfttox72OCoILQKmj6LUgLszPLeuNiExYpxHRUAPRysgCZ9QqToxhQoJZy7/o7MXblnbUdqSF8biHji+Qkk7Z40V7bXMdkS/zuns0i2LcMEEesPSP6Vj6e0P90kulf3H066v61vLN8+BGP4vVjz4MPuKo/Y8czfun45l1hXdwgF/SBE+XC+l3hPDy2rgWSFmmiQfrqbeSOFQSoiCcawjRe/QENDOWkwicMeEcCQyNidTQyC1C+IMLNIfzfynQbzv6Xwt0a3m9uO/a/xGft82KPA4F8xlzu0cY697v0T/OU20ZZa99ern9f/vM2r3/AAAA//8BAAD//4EYyvclDQAA" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/8RW25LjthF911ewXOXyi0niflH5wc5uJd6Kx9laf0EDaEisoQgFgDQef32KpDQjOetcnN34iRJw0H26+3QD35WCtWw3TQOHoMT8o21iZIIxqakXnqJVViFXOsrIpFDKWRWdQkloZAYwMBsFFY5KJkCygEC+3dd6LNu+LzVl2GG3S2k3IhyH0vl06B9PDvOEFUubcUQo2F+/Z9ox0pHeDVM/DtPp537htRwZsS70QBorCdGRcxqJCQyJYegoE9JoJaywUtrIifNeOgRkynMTOTLNBFPMfyZ6vo4LPau1YcJyFqRS2mvgGkAB986BIJQQUEZz1C5YjYajcWi4Ro4aYiBg/i09U1rIdYjga2n9NLyyI53pdO+noT2Op90wlXYh2S4k23W7q7tfFp4KUGjFpTXeSsOjcZIoIiO1QXmNFqPlnlGliRJKouYheiMQlVMcGH/luRvq/uQWbj5NFYYJc7j9eeFX+pCepjFBmPMoOtX7PLSvuDmWdtm4pd1VyN1CGfLhqlChwSkvmObRc+eIdwa9lVQzTYOl0ljiJShHUArHrKWowUTnUGtHFIpPK4GZ151CmUQhlDSaeGup0qi8UEoxjsFEIoEGRqLzThgPTiljKLHcWCdZMFox/pnoXRUKSHnQTnoiXaCGIFgnnTJRCBcAtItOUMIFMIw0KBODQcqk1VYHJVj8HAqdSf5aoQ6NtyCBKHToTXQ0cIVGaR8IiU5qrbVQYA1lQDwgs0ppbWI01nrJ5AvPq+66kPwj5oXkmpxSoQ5+/rgRe4Ds90r0K6xlpKPkwufNeCoV849wwG3j0+GYsZQOf4bDccTZ4OZNmuKw+xMU3DYHPMTZsV9P3QH7j55+N5UKk8e/5HQ6rl4OMJ9tT6WtWGpL4R70IY24bR4W0Oavq/pWDss4n9L0fEin8t2p7rdNhLHgpmn8bj76Ng9nzNumPJeKh/Cy/iGlum36+f+YTuF9TuchzEB4KsviEs3bH3/aNpSQToluztDNTjrAMG2vf7sxeZglh9Oc3rfoTrvdMO2+hymMmMu2qfk0s8Lz4OuQpu8hhyV5KT93cIZhnM99Qwl5GL6eUsBY7pa/vC4O87f8OSN+I7/8ejjA7p+h19U77KZp9qnUCQ74tzPmPATcNl99C0/lq03TLE2zpPQ9zFnsz5D7cXDXZu9fAZumGdPuBzzjuG3YpmkmrE8pP75fZH6RzTTMGyngD+BwXK7d1cnazN2Q+rxUdS39sj3D23m1uwfOczOnsT2OMOG2+eKLf4leDV5gU5oeoPz9hBkCvnn39sNNOUm/FPSYwgNMQ8RSL6Fj9Tdzpz9cdmddZNwNs/mf/B7Dacn4VXF+D9O0hNr+903RQwhpKr1LqZaa4dhezHXPcBg3WP0Lyd/p4CWKObzQz+pdbX8CY3jGqZbV3DGnmubsvZtFePfcapo9lP220Y57HRUEF4BSR9FrQVyYn1vWGxGZsE4joqEGopWRBc6oVZwYw4QEs5Z/0dmLty3tqO1IC+NxDx1fICWdsseL9trmOiJf5nX3aBbFuGGCPGDpH9Ox9PeG+qWXSv/i6NdX9a3lm+fBjX4Wqx99GHzEUfsfOZr3T8cz6wrv4AC/pAmeLhfS7wjh5bVxLZCyTBMP1lNvJXGoJERBONcQovfoCWhmLCcROGPCORIYGhOpoZFbhPAHF2gO5/9SoN929L8W6NbyenHftf8jPm+bFXkcCuYz5naPMNa936N/nKfaMspe+/Ry+//2mbV7/wEAAP//AQAA///FJpYFJQ0AAA==" | 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/7SV247UOBrH7+spIiTEDZX4fIi4gKW1C1pgEfsEn+3P1RGJXWu7qul9+lFSXdPdMyONRhqu4nwH+5e//3be1YqtjruugyUosQ72XYxMMCY19cJTtMoq5EpHGZkUSjmrolMoCY3MAAZmo6DCUckESBYQyNvb1o51HIbacoED9oecDzPCcaq9z8vw/eSwJGxY9wVnhIrD9XmmPSM9GdyUhnlKpx/DxrW1zNg2PJDGSkJ05JxGYgJDYhg6yoQ0WgkrrJQ2cuK8lw4BmfLcRI5MM8EU8z8Jz7d5w7NaGyYsZ0Eqpb0GrgEUcO8cCEIJAWU0R+2C1Wg4GoeGa+SoIQYC5k/xTN1DaVME3+rep+mRjvSm14NP0/44nw5TqvsNcr9B7i/pvh3+v3EqQKEVl9Z4Kw2PxkmiiIzUBuU1WoyWe0aVJkooiZqH6I1AVE5xYPyR8zC125Pb2HxODaaEJTwdPvDVIeS7NGcIq46iV4Mv0/6xbv2W/ZZ4it03KP2GDGW5OlRocMoLpnn03DninUFvJdVM02CpNJZ4CcoRlMIxaylqMNE51NoRheLvtcDK9cyhTKIQShpNvLVUaVReKKUYx2AikUADI9F5J4wHp5QxlFhurJMsGK0Y/0l4V4cCUh60k55IF6ghCNZJp0wUwgUA7aITlHABDCMNysRgkDJptdVBCRZ/hkNXyN861FrjuFNKWc5lpECD8ULL6LRnlGKgKKhnMXLNtLTcIpOMK6W8dzpY+ngPXX3Xh+y/Y9kgL+LUBm3y68PNOAAUf6vEcCnbM9JT0quN5/18qg3LF1hw7HxejgVr7fEHLMcZ1wl373OK0+EfUHHsFlziurC/dD0rHP6w+2OqDZLHf5V8Ol5WSTlgfZ74lmccuy854O7fF79dVt0u8JTT/ZJP9d2p3Y5dhLniruv8YW28KdMZy9jV+9pwCb/Gv+Xcxm5Y3+d8Cl9LPk9hLYS7ugU3/psv/x07SkivRL9q8iSTF5jSeH3t5+xhNRmmVdAbdKfDYUqHD5DCjKWOXSunlQrPk29TTh+ghE2uXO57OMM0r31vKCGfp9erALE+C7+8BqdNnX8WxDfy5etpgcPvS6/RZ7W7rrvNtSVY8D9nLGUKOHav3sJdfbXruu2YbJJ+hVXF4QxlmCd3Pd7DY8Gu6+Z8+IRnnMeO7bouYbvL5fvXzdgPRknTmsgBP4HDefvRXha5HN9+ykPZ9nSt2ZLrYL/G+udla3zsXrzY5kufof7vhAUCvv948+3J5pBh255jDp8hTRFre/gQbP7JvTEsD9m687eQ0sa2/+u+HSCEnOrgcm61FTjuH6br72GZd78AAAD//wEAAP//0Yc2jV8IAAA=" | base64 -d | gzip -d > conf/kube_env.yaml
+echo "H4sIAAAAAAAA/7SV3Y7UNhvHz+cqIiTECUlsx58RB/CyegsqUESv4LH9eDYisae2Z5bt1VfJ7LA7baWqUjmK83zYv/z9t/OmFKxl3DUNLF7yddA2ITDOmFDUcUfRSCNxkCqIwASX0hoZrERBaGAa0DMTOOWWCsZBMI9AXt/Weihj35eaMuyx26e0nxEOU+lcWvqvR4s5YsXSZpwRCvaX54l2jHSkt1Ps5ykev/Ub19YyY93wQGgjCFFhGGgg2jMkmqGljAutJDfcCGHCQKxzwiIgk27QYUCmGGeSuR+E5+q84RmlNONmYF5IqZyCQQFIGJy1wAklBKRWAyrrjUI9oLaoB4UDKgiegP5HPF1ayHUK4GppXZwe6UinO9W7OLWH+bifYmk3yHaDbM/pru5/3zglIFdyEEY7I/QQtBVEEhGo8dIpNBjM4BiVikguBarBB6c5orRyADY8cu6nenu0G5tLscIUMfunwwe+0vt0F+cEftWRd7J3eWof69ZvabfEU+yuQu42ZMjLxaFcgZWOMzUEN1hLnNXojKCKKeoNFdoQJ0BagoJbZgxFBTpYi0pZIpH/txZYua4cygRyLoVWxBlDpULpuJSSDeh1IAKoZyRYZ7l2YKXUmhIzaGMF81pJNvwgvItDAenglRWOCOupJgjGCit14Nx6AGWD5ZQMHBgG6qUOXiNlwiijvOQs/AiHrpB/dqhF7QwIIBItOh0s9YNELZXzhAQrlFKKSzCaMiAOkBkpldIhaGOcYOI758V3nU/uK+YN8ixOqVAntz7sjD1AdreS9+eylpGOkgeet/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//6MxCkNfCAAA" | 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
-    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+    - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+    - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+    - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-    - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+    - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+  - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+  - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.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
-  - 998b3b6669335f1a1d8c475fb7c211ed1e41c2ff37275939e2523666ccb7d910@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz
+  - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz
 ClusterName: existing-iam.example.com
 ConfigBase: memfs://tests/existing-iam.example.com
 InstanceGroupName: master-us-test-1c