test/e2e fix fail-swap-on=false flag not being part of kind images an…

…ymore
kubernetes-sigs · May 31, 2023 · ea267b8 · ea267b8
1 parent 89429b8
commit ea267b8
Show file tree

Hide file tree

Showing 22 changed files with 210 additions and 0 deletions.
diff --git a/test/e2e/data/infrastructure-docker/main/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/main/bases/cluster-with-kcp.yaml
@@ -89,9 +89,11 @@ spec:
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
     joinConfiguration:
       nodeRegistration:
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
   version: "${KUBERNETES_VERSION}"
diff --git a/test/e2e/data/infrastructure-docker/main/bases/md.yaml b/test/e2e/data/infrastructure-docker/main/bases/md.yaml
@@ -27,6 +27,7 @@ spec:
           criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
             eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            fail-swap-on: "false"
 ---
 # MachineDeployment object
 apiVersion: cluster.x-k8s.io/v1beta1

diff --git a/test/e2e/data/infrastructure-docker/main/bases/mp.yaml b/test/e2e/data/infrastructure-docker/main/bases/mp.yaml
@@ -47,3 +47,4 @@ spec:
     nodeRegistration:
       kubeletExtraArgs:
         eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+        fail-swap-on: "false"
diff --git a/...data/infrastructure-docker/main/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml b/...data/infrastructure-docker/main/cluster-template-kcp-adoption/step1/cluster-with-cp0.yaml
@@ -49,11 +49,13 @@ spec:
       criSocket: unix:///var/run/containerd/containerd.sock
       kubeletExtraArgs:
         eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+        fail-swap-on: "false"
   joinConfiguration:
     nodeRegistration:
       criSocket: unix:///var/run/containerd/containerd.sock
       kubeletExtraArgs:
         eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+        fail-swap-on: "false"
 ---
 # cp0 Machine
 apiVersion: cluster.x-k8s.io/v1beta1

diff --git a/...2e/data/infrastructure-docker/main/cluster-template-kcp-remediation/cluster-with-kcp.yaml b/...2e/data/infrastructure-docker/main/cluster-template-kcp-remediation/cluster-with-kcp.yaml
@@ -62,10 +62,12 @@ spec:
       nodeRegistration:
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
     joinConfiguration:
       nodeRegistration:
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
     files:
     - path: /wait-signal.sh
       content: |

diff --git a/test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml b/test/e2e/data/infrastructure-docker/main/cluster-template-upgrades-cgroupfs/mp-cgroupfs.yaml
@@ -11,3 +11,4 @@ spec:
         # kind will implement systemd support in: https://github.com/kubernetes-sigs/kind/issues/1726
         cgroup-driver: cgroupfs
         eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+        fail-swap-on: "false"
diff --git a/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml b/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start-runtimesdk.yaml
@@ -49,6 +49,43 @@ spec:
       generateExtension: generate-patches.k8s-upgrade-with-runtimesdk
       validateExtension: validate-topology.k8s-upgrade-with-runtimesdk
       discoverVariablesExtension: discover-variables.k8s-upgrade-with-runtimesdk
+  - name: failSwap-controlPlane
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.controlPlane.version }}'
+    definitions:
+    - selector:
+        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+        kind: KubeadmControlPlaneTemplate
+        matchResources:
+          controlPlane: true
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+  - name: failSwap-machineDeployment
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.machineDeployment.version }}'
+    definitions:
+    - selector:
+        apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+        kind: KubeadmConfigTemplate
+        matchResources:
+          machineDeploymentClass:
+            names:
+            - '*-worker'
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: DockerClusterTemplate

diff --git a/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/main/clusterclass-quick-start.yaml
@@ -164,6 +164,43 @@ spec:
       - op: add
         path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
         value: cgroupfs
+  - name: failSwap-controlPlane
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.controlPlane.version }}'
+    definitions:
+    - selector:
+        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+        kind: KubeadmControlPlaneTemplate
+        matchResources:
+          controlPlane: true
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+  - name: failSwap-machineDeployment
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.machineDeployment.version }}'
+    definitions:
+    - selector:
+        apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+        kind: KubeadmConfigTemplate
+        matchResources:
+          machineDeploymentClass:
+            names:
+            - '*-worker'
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
   - name: etcdImageTag
     description: "Sets tag to use for the etcd image in the KubeadmControlPlane."
     definitions:

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
@@ -72,6 +72,7 @@ spec:
           # 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%'
+          fail-swap-on: "false"
     joinConfiguration:
       nodeRegistration:
         criSocket: unix:///var/run/containerd/containerd.sock
@@ -80,4 +81,5 @@ spec:
           # 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%'
+          fail-swap-on: "false"
   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
@@ -28,6 +28,7 @@ spec:
             # 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%'
+            fail-swap-on: "false"
 ---
 # MachineDeployment object
 apiVersion: cluster.x-k8s.io/v1alpha4

diff --git a/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml b/test/e2e/data/infrastructure-docker/v0.4/bases/mp.yaml
@@ -40,3 +40,4 @@ spec:
         # 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%
+        fail-swap-on: "false"
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
@@ -90,6 +90,7 @@ spec:
           # 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%'
+          fail-swap-on: "false"
     joinConfiguration:
       nodeRegistration:
         criSocket: unix:///var/run/containerd/containerd.sock
@@ -98,4 +99,5 @@ spec:
           # 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%'
+          fail-swap-on: "false"
   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
@@ -28,6 +28,7 @@ spec:
             # 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%'
+            fail-swap-on: "false"
 ---
 # MachineDeployment object
 apiVersion: cluster.x-k8s.io/v1beta1

diff --git a/test/e2e/data/infrastructure-docker/v1.3/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1.3/bases/cluster-with-kcp.yaml
@@ -89,9 +89,11 @@ spec:
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
     joinConfiguration:
       nodeRegistration:
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
   version: "${KUBERNETES_VERSION}"
diff --git a/test/e2e/data/infrastructure-docker/v1.3/bases/md.yaml b/test/e2e/data/infrastructure-docker/v1.3/bases/md.yaml
@@ -27,6 +27,7 @@ spec:
           criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
             eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            fail-swap-on: "false"
 ---
 # MachineDeployment object
 apiVersion: cluster.x-k8s.io/v1beta1

diff --git a/test/e2e/data/infrastructure-docker/v1.3/bases/mp.yaml b/test/e2e/data/infrastructure-docker/v1.3/bases/mp.yaml
@@ -47,3 +47,4 @@ spec:
     nodeRegistration:
       kubeletExtraArgs:
         eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+        fail-swap-on: "false"
diff --git a/test/e2e/data/infrastructure-docker/v1.3/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/v1.3/clusterclass-quick-start.yaml
@@ -152,6 +152,43 @@ spec:
       - op: add
         path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
         value: cgroupfs
+  - name: failSwap-controlPlane
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.controlPlane.version }}'
+    definitions:
+    - selector:
+        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+        kind: KubeadmControlPlaneTemplate
+        matchResources:
+          controlPlane: true
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+  - name: failSwap-machineDeployment
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.machineDeployment.version }}'
+    definitions:
+    - selector:
+        apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+        kind: KubeadmConfigTemplate
+        matchResources:
+          machineDeploymentClass:
+            names:
+            - '*-worker'
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
   - name: etcdImageTag
     description: "Sets tag to use for the etcd image in the KubeadmControlPlane."
     definitions:

diff --git a/test/e2e/data/infrastructure-docker/v1.4/bases/cluster-with-kcp.yaml b/test/e2e/data/infrastructure-docker/v1.4/bases/cluster-with-kcp.yaml
@@ -89,9 +89,11 @@ spec:
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
     joinConfiguration:
       nodeRegistration:
         criSocket: unix:///var/run/containerd/containerd.sock
         kubeletExtraArgs:
           eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+          fail-swap-on: "false"
   version: "${KUBERNETES_VERSION}"
diff --git a/test/e2e/data/infrastructure-docker/v1.4/bases/md.yaml b/test/e2e/data/infrastructure-docker/v1.4/bases/md.yaml
@@ -27,6 +27,7 @@ spec:
           criSocket: unix:///var/run/containerd/containerd.sock
           kubeletExtraArgs:
             eviction-hard: 'nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%'
+            fail-swap-on: "false"
 ---
 # MachineDeployment object
 apiVersion: cluster.x-k8s.io/v1beta1

diff --git a/test/e2e/data/infrastructure-docker/v1.4/bases/mp.yaml b/test/e2e/data/infrastructure-docker/v1.4/bases/mp.yaml
@@ -47,3 +47,4 @@ spec:
     nodeRegistration:
       kubeletExtraArgs:
         eviction-hard: nodefs.available<0%,nodefs.inodesFree<0%,imagefs.available<0%
+        fail-swap-on: "false"
diff --git a/test/e2e/data/infrastructure-docker/v1.4/clusterclass-quick-start.yaml b/test/e2e/data/infrastructure-docker/v1.4/clusterclass-quick-start.yaml
@@ -152,6 +152,43 @@ spec:
       - op: add
         path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
         value: cgroupfs
+  - name: failSwap-controlPlane
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.controlPlane.version }}'
+    definitions:
+    - selector:
+        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+        kind: KubeadmControlPlaneTemplate
+        matchResources:
+          controlPlane: true
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+  - name: failSwap-machineDeployment
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.machineDeployment.version }}'
+    definitions:
+    - selector:
+        apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+        kind: KubeadmConfigTemplate
+        matchResources:
+          machineDeploymentClass:
+            names:
+            - '*-worker'
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
   - name: etcdImageTag
     description: "Sets tag to use for the etcd image in the KubeadmControlPlane."
     definitions:

diff --git a/test/infrastructure/docker/templates/clusterclass-quick-start.yaml b/test/infrastructure/docker/templates/clusterclass-quick-start.yaml
@@ -132,6 +132,44 @@ spec:
       - op: add
         path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/cgroup-driver"
         value: cgroupfs
+
+  - name: failSwap-controlPlane
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.controlPlane.version }}'
+    definitions:
+    - selector:
+        apiVersion: controlplane.cluster.x-k8s.io/v1beta1
+        kind: KubeadmControlPlaneTemplate
+        matchResources:
+          controlPlane: true
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/initConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+      - op: add
+        path: "/spec/template/spec/kubeadmConfigSpec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
+  - name: failSwap-machineDeployment
+    description: |
+      Sets the fail-swap-on flag to false if a Kubernetes version >= v1.22 is referenced.
+      This is required to allow usage on swap-enabled clusters, because otherwise the
+      kubelet does not start.
+    enabledIf: '{{ semverCompare ">= v1.22" .builtin.machineDeployment.version }}'
+    definitions:
+    - selector:
+        apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+        kind: KubeadmConfigTemplate
+        matchResources:
+          machineDeploymentClass:
+            names:
+            - '*-worker'
+      jsonPatches:
+      - op: add
+        path: "/spec/template/spec/joinConfiguration/nodeRegistration/kubeletExtraArgs/fail-swap-on"
+        value: "false"
   - name: etcdImageTag
     description: "Sets tag to use for the etcd image in the KubeadmControlPlane."
     definitions: