Skip to content

Commit

Permalink
ci-e2e: upgrade kind to 0.11
Browse files Browse the repository at this point in the history
* --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
  • Loading branch information
sbueringer committed Apr 12, 2021
1 parent b76683d commit 3e490c8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
6 changes: 3 additions & 3 deletions scripts/ci-e2e-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

4 changes: 3 additions & 1 deletion test/e2e/data/infrastructure-docker/v1alpha4/bases/md.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions test/e2e/data/infrastructure-docker/v1alpha4/bases/mp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ spec:
nodeRegistration:
kubeletExtraArgs:
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
cgroup-driver: cgroupfs

0 comments on commit 3e490c8

Please sign in to comment.