diff --git a/test/e2e/data/infrastructure-docker/v0.3/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v0.3/bases/cluster-with-kcp.yaml index 98cba3f868fe..0e0dfb203837 100644 --- a/test/e2e/data/infrastructure-docker/v0.3/bases/cluster-with-kcp.yaml +++ b/test/e2e/data/infrastructure-docker/v0.3/bases/cluster-with-kcp.yaml @@ -67,10 +67,16 @@ spec: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' joinConfiguration: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' version: "${KUBERNETES_VERSION}" diff --git a/test/e2e/data/infrastructure-docker/v0.3/bases/md.yaml b/test/e2e/data/infrastructure-docker/v0.3/bases/md.yaml index d73e3b14ee8d..88453ca32686 100644 --- a/test/e2e/data/infrastructure-docker/v0.3/bases/md.yaml +++ b/test/e2e/data/infrastructure-docker/v0.3/bases/md.yaml @@ -24,6 +24,9 @@ spec: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' --- # MachineDeployment object with diff --git a/test/e2e/data/infrastructure-docker/v0.4/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v0.4/bases/cluster-with-kcp.yaml index 39aa64f9aaea..2f591de39f70 100644 --- a/test/e2e/data/infrastructure-docker/v0.4/bases/cluster-with-kcp.yaml +++ b/test/e2e/data/infrastructure-docker/v0.4/bases/cluster-with-kcp.yaml @@ -68,10 +68,16 @@ spec: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' joinConfiguration: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' version: "${KUBERNETES_VERSION}" diff --git a/test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml b/test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml index 6c76f6f653bb..54f46982d120 100644 --- a/test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml +++ b/test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml @@ -24,6 +24,9 @@ spec: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' --- # MachineDeployment object diff --git a/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml b/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml index f8090a7a839c..df4ec8ad4c67 100644 --- a/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml +++ b/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml @@ -36,4 +36,7 @@ spec: joinConfiguration: nodeRegistration: kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0% diff --git a/test/e2e/data/infrastructure-docker/v1.0/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1.0/bases/cluster-with-kcp.yaml index fa8720f9833f..37df3f04655d 100644 --- a/test/e2e/data/infrastructure-docker/v1.0/bases/cluster-with-kcp.yaml +++ b/test/e2e/data/infrastructure-docker/v1.0/bases/cluster-with-kcp.yaml @@ -86,10 +86,16 @@ spec: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' joinConfiguration: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' version: "${KUBERNETES_VERSION}" diff --git a/test/e2e/data/infrastructure-docker/v1.0/bases/md.yaml b/test/e2e/data/infrastructure-docker/v1.0/bases/md.yaml index 11abbc29248a..a3501adb5497 100644 --- a/test/e2e/data/infrastructure-docker/v1.0/bases/md.yaml +++ b/test/e2e/data/infrastructure-docker/v1.0/bases/md.yaml @@ -24,6 +24,9 @@ spec: nodeRegistration: criSocket: unix:///var/run/containerd/containerd.sock kubeletExtraArgs: + # We have to pin the cgroupDriver to cgroupfs for Kubernetes < v1.24 because kind does not support systemd for those versions, but kubeadm >= 1.21 defaults to systemd. + # This cluster is used in tests where the Kubernetes version is < 1.24 + cgroup-driver: cgroupfs eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%' --- # MachineDeployment object