upgrade to kind v0.11.0

kubernetes-sigs · May 19, 2021 · 5dd65cb · 5dd65cb
1 parent 799da05
commit 5dd65cb
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 75 deletions.
diff --git a/docs/book/src/developer/providers/v1alpha3-to-v1alpha4.md b/docs/book/src/developer/providers/v1alpha3-to-v1alpha4.md
@@ -12,7 +12,7 @@
 
 ## Kind version
 
-- The KIND version used for this release is v0.9.x
+- The KIND version used for this release is v0.11.x
 
 ## Upgrade kube-rbac-proxy to v0.8.0
 

diff --git a/go.mod b/go.mod
@@ -37,6 +37,6 @@ require (
 	k8s.io/kubectl v0.21.0
 	k8s.io/utils v0.0.0-20210305010621-2afb4311ab10
 	sigs.k8s.io/controller-runtime v0.9.0-beta.1
-	sigs.k8s.io/kind v0.9.0
+	sigs.k8s.io/kind v0.11.0
 	sigs.k8s.io/yaml v1.2.0
 )
diff --git a/go.sum b/go.sum
diff --git a/hack/ensure-kind.sh b/hack/ensure-kind.sh
@@ -21,7 +21,7 @@ set -o pipefail
 set -x
 
 GOPATH_BIN="$(go env GOPATH)/bin/"
-MINIMUM_KIND_VERSION=v0.9.0
+MINIMUM_KIND_VERSION=v0.11.0
 
 # Ensure the kind tool exists and is a viable version, or installs it
 verify_kind_version() {

diff --git a/scripts/ci-e2e-lib.sh b/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"

diff --git a/test/infrastructure/docker/go.mod b/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-beta.1
-	sigs.k8s.io/kind v0.9.0
+	sigs.k8s.io/kind v0.11.0
 	sigs.k8s.io/yaml v1.2.0
 )
 

diff --git a/test/infrastructure/docker/go.sum b/test/infrastructure/docker/go.sum