From eb35dbe5bdb07cf02c10f8ffb61be4b716c31a76 Mon Sep 17 00:00:00 2001 From: killianmuldoon Date: Fri, 19 May 2023 08:59:28 +0100 Subject: [PATCH] Revert "Pin cgroup driver used in v0.3, v0.4 and templates" This reverts commit 5ed1846faa7fe3f51f82b3c7b597fdf828100ded. --- .../infrastructure-docker/v0.3/bases/cluster-with-kcp.yaml | 6 ------ test/e2e/data/infrastructure-docker/v0.3/bases/md.yaml | 3 --- .../infrastructure-docker/v0.4/bases/cluster-with-kcp.yaml | 6 ------ test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml | 3 --- test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml | 3 --- 5 files changed, 21 deletions(-) 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 0e0dfb203837..98cba3f868fe 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,16 +67,10 @@ 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 88453ca32686..d73e3b14ee8d 100644 --- a/test/e2e/data/infrastructure-docker/v0.3/bases/md.yaml +++ b/test/e2e/data/infrastructure-docker/v0.3/bases/md.yaml @@ -24,9 +24,6 @@ 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 2f591de39f70..39aa64f9aaea 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,16 +68,10 @@ 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 54f46982d120..6c76f6f653bb 100644 --- a/test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml +++ b/test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml @@ -24,9 +24,6 @@ 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 df4ec8ad4c67..f8090a7a839c 100644 --- a/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml +++ b/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml @@ -36,7 +36,4 @@ 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%