Update Docker to v20.10.5

[bmelbourne]

What this PR does / why we need it:
Update default Docker version to v20.10.5 for all Kubernetes versions v1.21+.

https://github.com/kubernetes/kubernetes/blob/v1.21.0/build/dependencies.yaml#L72-L77

Which issue(s) this PR fixes:
N/A

Special notes for your reviewer:

[bmelbourne]

@hakman @olemarkus @rifelpet
I've added the following code snippet to func TestPopulateCluster_DockerVersion(t *testing.T) but it's not setting DockerVersion as it doesn't appear to recognise k8s v1.21.0 when it populates cluster.spec.KubernetesVersion.

https://github.com/kubernetes/kops/blob/master/upup/pkg/fi/cloudup/populatecluster_test.go#L374
https://github.com/kubernetes/kops/blob/master/upup/pkg/fi/cloudup/populate_cluster_spec.go#L220-L225

		{
			KubernetesVersion: "1.21.0",
			DockerVersion:     "20.10.5",
		},

I've also added the following code snippet to func (b *DockerOptionsBuilder) BuildOptions(o interface{}) in docker.go.

		if b.IsKubernetesGTE("1.21") {
			docker.Version = fi.String("20.10.5")

When I run hack/update-expected.sh, I get the following error.

--- FAIL: TestPopulateCluster_DockerVersion (0.00s)
    populatecluster_test.go:411: Unexpected DockerVersion:

If I change the k8s version to 1.19.0 in both code snippets, the updated-expected.sh script reports no errors.

How is the KubernetesVersion validated for the integration tests?

[hakman]

@bmelbourne I took a quick look and I think you are changing too much. Unit tests should not be updated on each new Docker release. Same goes for docs examples.

To fix the error, you will need to update TestPopulateCluster_DockerVersion to always set container runtime to docker. As you know, starting kOps 1.20 the default container runtime is containerd and so, there is no Docker version by default.

--- a/upup/pkg/fi/cloudup/populatecluster_test.go
+++ b/upup/pkg/fi/cloudup/populatecluster_test.go
@@ -392,11 +392,16 @@ func TestPopulateCluster_DockerVersion(t *testing.T) {
                        KubernetesVersion: "1.17.0",
                        DockerVersion:     "19.03.15",
                },
+               {
+                       KubernetesVersion: "1.21.0",
+                       DockerVersion:     "20.10.5",
+               },
        }
 
        for _, test := range grid {
                _, c := buildMinimalCluster()
                c.Spec.KubernetesVersion = test.KubernetesVersion
+               c.Spec.ContainerRuntime = "docker"
 
                full, err := build(c)
                if err != nil {

[bmelbourne]

@hakman
Thanks for responding. Good to discover only a simple fix is required. I suspected it had something to do with the default container runtime being set as containerd but as this set of integration tests was specific to Docker, I just wanted to be sure that I hadn't overlooked something obvious elsewhere in the codebase.

I've reduced the number of changes to keep the PR focused on upgrading Docker to v20.10.5.

[hakman]

Thanks @bmelbourne. I added a few more suggestions that should reduce the scope even more.

[hakman]

Last set of changes, you should remove the WIP after it. :)

[bmelbourne]

/retest

[hakman]

/retest

[hakman]

/retest

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [hakman]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[bmelbourne]

/retest

[hakman]

/lgtm
/retest