Skip to content

Commit 9be885c

Browse files
authored
Merge pull request #8767 from chrischdi/pr-fail-swap-on-false
🐛 test/e2e fix fail-swap-on=false flag not being part of kind images anymore
2 parents e2bab2f + c939389 commit 9be885c

File tree

22 files changed

+39
-0
lines changed

22 files changed

+39
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,11 @@ spec:
8989
criSocket: unix:///var/run/containerd/containerd.sock
9090
kubeletExtraArgs:
9191
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
92+
fail-swap-on: "false"
9293
joinConfiguration:
9394
nodeRegistration:
9495
criSocket: unix:///var/run/containerd/containerd.sock
9596
kubeletExtraArgs:
9697
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
98+
fail-swap-on: "false"
9799
version: "${KUBERNETES_VERSION}"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ spec:
2727
criSocket: unix:///var/run/containerd/containerd.sock
2828
kubeletExtraArgs:
2929
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
30+
fail-swap-on: "false"
3031
---
3132
# MachineDeployment object
3233
apiVersion: cluster.x-k8s.io/v1beta1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ spec:
4747
nodeRegistration:
4848
kubeletExtraArgs:
4949
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
50+
fail-swap-on: "false"

test/e2e/data/infrastructure-docker/main/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ spec:
4949
criSocket: unix:///var/run/containerd/containerd.sock
5050
kubeletExtraArgs:
5151
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
52+
fail-swap-on: "false"
5253
joinConfiguration:
5354
nodeRegistration:
5455
criSocket: unix:///var/run/containerd/containerd.sock
5556
kubeletExtraArgs:
5657
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
58+
fail-swap-on: "false"
5759
---
5860
# cp0 Machine
5961
apiVersion: cluster.x-k8s.io/v1beta1

test/e2e/data/infrastructure-docker/main/cluster-template-kcp-remediation/cluster-with-kcp.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,12 @@ spec:
6262
nodeRegistration:
6363
kubeletExtraArgs:
6464
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
65+
fail-swap-on: "false"
6566
joinConfiguration:
6667
nodeRegistration:
6768
kubeletExtraArgs:
6869
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
70+
fail-swap-on: "false"
6971
files:
7072
- path: /wait-signal.sh
7173
content: |

test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ spec:
1111
# kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
1212
cgroup-driver: cgroupfs
1313
eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
14+
fail-swap-on: "false"

test/e2e/data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,14 @@ spec:
9797
criSocket: unix:///var/run/containerd/containerd.sock
9898
kubeletExtraArgs:
9999
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
100+
fail-swap-on: "false"
100101
joinConfiguration:
101102
nodeRegistration:
102103
# We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
103104
criSocket: unix:///var/run/containerd/containerd.sock
104105
kubeletExtraArgs:
105106
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
107+
fail-swap-on: "false"
106108
---
107109
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
108110
kind: DockerMachineTemplate
@@ -139,4 +141,5 @@ spec:
139141
criSocket: unix:///var/run/containerd/containerd.sock
140142
kubeletExtraArgs:
141143
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
144+
fail-swap-on: "false"
142145

test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,12 +435,14 @@ spec:
435435
criSocket: unix:///var/run/containerd/containerd.sock
436436
kubeletExtraArgs:
437437
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
438+
fail-swap-on: "false"
438439
joinConfiguration:
439440
nodeRegistration:
440441
# We have to set the criSocket to containerd as kubeadm defaults to docker runtime if both containerd and docker sockets are found
441442
criSocket: unix:///var/run/containerd/containerd.sock
442443
kubeletExtraArgs:
443444
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
445+
fail-swap-on: "false"
444446
---
445447
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
446448
kind: DockerMachineTemplate
@@ -504,4 +506,5 @@ spec:
504506
criSocket: unix:///var/run/containerd/containerd.sock
505507
kubeletExtraArgs:
506508
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
509+
fail-swap-on: "false"
507510

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ spec:
7272
# This cluster is used in tests where the Kubernetes version is < 1.24
7373
cgroup-driver: cgroupfs
7474
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
75+
fail-swap-on: "false"
7576
joinConfiguration:
7677
nodeRegistration:
7778
criSocket: unix:///var/run/containerd/containerd.sock
@@ -80,4 +81,5 @@ spec:
8081
# This cluster is used in tests where the Kubernetes version is < 1.24
8182
cgroup-driver: cgroupfs
8283
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
84+
fail-swap-on: "false"
8385
version: "${KUBERNETES_VERSION}"

test/e2e/data/infrastructure-docker/v0.4/bases/md.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ spec:
2828
# This cluster is used in tests where the Kubernetes version is < 1.24
2929
cgroup-driver: cgroupfs
3030
eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
31+
fail-swap-on: "false"
3132
---
3233
# MachineDeployment object
3334
apiVersion: cluster.x-k8s.io/v1alpha4

0 commit comments

Comments
 (0)