ci-e2e: upgrade kind to 0.11

* --type is not supported anymore. docker is now always used and bazel support has been dropped.
* we have to set cgroup-driver cgroupfs, otherwise systemd is used and this doesn't work with the latest kind/Kubernetes version

go.mod

@@ -37,6 +37,6 @@ require (
 	k8s.io/kubectl v0.21.0-beta.1
 	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
 	sigs.k8s.io/controller-runtime v0.9.0-alpha.1
-	sigs.k8s.io/kind v0.9.0
+	sigs.k8s.io/kind v0.10.1-0.20210406115533-b6bc11252265
 	sigs.k8s.io/yaml v1.2.0
 )

scripts/ci-e2e-lib.sh

@@ -127,7 +127,7 @@ kind::buildNodeImage() {
   # build the node image
   version="${version//+/_}"
   echo "+ Building kindest/node:$version"
-  kind build node-image --type docker --image "kindest/node:$version"
+  kind build node-image --image "kindest/node:$version"
 
   # move back to Cluster API
   cd "$REPO_ROOT" || exit
@@ -146,7 +146,7 @@ k8s::checkoutBranch() {
     # should be already been tagged.
     echo "+ checkout tag $version"
     git fetch --all --tags
-    git checkout "tags/$version" -b "$version-branch"
+    git checkout "tags/$version" -B "$version-branch"
   else
     # otherwise we are requiring a Kubernetes version that should be built from HEAD
     # of one of the existing branches
@@ -163,7 +163,7 @@ k8s::checkoutBranch() {
     if [[ "$releaseBranch" != "" ]]; then
       # if there is already a release branch for the required Kubernetes branch, use it
       echo "+ checkout $releaseBranch branch"
-      git checkout "$releaseBranch" -b "release-$major.$minor"
+      git checkout "$releaseBranch" -B "release-$major.$minor"
     else
       # otherwise, we should build from master, which is the branch for the next release
       echo "+ checkout master branch"

test/e2e/data/infrastructure-docker/v1alpha4/bases/cluster-with-kcp.yaml

@@ -66,10 +66,14 @@ spec:
     initConfiguration:
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
-        kubeletExtraArgs: {eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'}
+        kubeletExtraArgs:
+          eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          cgroup-driver: cgroupfs
     joinConfiguration:
       nodeRegistration:
         criSocket: /var/run/containerd/containerd.sock
-        kubeletExtraArgs: {eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'}
+        kubeletExtraArgs:
+          eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          cgroup-driver: cgroupfs
   version: "${KUBERNETES_VERSION}"
 

test/e2e/data/infrastructure-docker/v1alpha4/bases/md.yaml

@@ -23,7 +23,9 @@ spec:
       joinConfiguration:
         nodeRegistration:
           criSocket: /var/run/containerd/containerd.sock
-          kubeletExtraArgs: {eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'}
+          kubeletExtraArgs:
+            eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            cgroup-driver: cgroupfs
 ---
 # MachineDeployment object
 apiVersion: cluster.x-k8s.io/v1alpha4

test/e2e/data/infrastructure-docker/v1alpha4/bases/mp.yaml

@@ -37,3 +37,4 @@ spec:
     nodeRegistration:
       kubeletExtraArgs:
         eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+        cgroup-driver: cgroupfs

test/infrastructure/docker/go.mod

@@ -15,7 +15,7 @@ require (
 	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
 	sigs.k8s.io/cluster-api v0.3.3
 	sigs.k8s.io/controller-runtime v0.9.0-alpha.1
-	sigs.k8s.io/kind v0.9.0
+	sigs.k8s.io/kind v0.10.1-0.20210406115533-b6bc11252265
 	sigs.k8s.io/yaml v1.2.0
 )