From 8944af7e4391aed8b50568276ed02fe4fcd7fd3e Mon Sep 17 00:00:00 2001
From: Ryan Emerson <remerson@redhat.com>
Date: Fri, 20 Oct 2023 09:43:59 +0100
Subject: [PATCH] Utilise quay.io/infinispan-test/kindest-node:v1.24.15 in
 testsuite

- Explicitly use `cgroupDriver: cgroupfs`
---
 .github/workflows/upgrade_tests.yaml | 2 +-
 scripts/ci/configure-xsite.sh        | 6 +++++-
 scripts/ci/kind.sh                   | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/upgrade_tests.yaml b/.github/workflows/upgrade_tests.yaml
index 88fa30c0f..10082e37b 100644
--- a/.github/workflows/upgrade_tests.yaml
+++ b/.github/workflows/upgrade_tests.yaml
@@ -22,7 +22,7 @@ env:
   CONFIG_LISTENER_IMAGE: localhost:5001/infinispan-operator
   KUBECONFIG: ${{ github.workspace }}/kind-kube-config.yaml
   TESTING_LOG_DIR: ${{ github.workspace }}/test/reports
-  KINDEST_NODE_VERSION: v1.24.7
+  KINDEST_NODE_VERSION: v1.24.15
 
 jobs:
   build:
diff --git a/scripts/ci/configure-xsite.sh b/scripts/ci/configure-xsite.sh
index 9de883767..7192e5cc3 100755
--- a/scripts/ci/configure-xsite.sh
+++ b/scripts/ci/configure-xsite.sh
@@ -9,7 +9,7 @@ METALLB_VERSION=v0.9.6
 TESTING_NAMESPACE=${TESTING_NAMESPACE-namespace-for-testing}
 KIND_SUBNET=${KIND_SUBNET-172.172.0.0}
 SERVER_IMAGE=${SERVER_IMAGE:-'quay.io/infinispan/server:14.0'}
-KINDEST_NODE_VERSION=${KINDEST_NODE_VERSION:-'v1.22.17'}
+KINDEST_NODE_VERSION=${KINDEST_NODE_VERSION:-'v1.24.15'}
 
 # Cleanup any existing clusters
 kind delete clusters --all
@@ -33,6 +33,10 @@ nodes:
     image: quay.io/infinispan-test/kindest-node:${KINDEST_NODE_VERSION}
   - role: worker
     image: quay.io/infinispan-test/kindest-node:${KINDEST_NODE_VERSION}
+    kubeadmConfigPatches:
+    - |
+      kind: KubeletConfiguration
+      cgroupDriver: cgroupfs
 EOF
   kind load docker-image $IMG --name "${INSTANCE}"
   kind load docker-image ${SERVER_IMAGE} --name "${INSTANCE}"
diff --git a/scripts/ci/kind.sh b/scripts/ci/kind.sh
index 1db085c98..585121993 100755
--- a/scripts/ci/kind.sh
+++ b/scripts/ci/kind.sh
@@ -3,7 +3,7 @@
 set -o errexit
 
 SERVER_TAGS=${SERVER_TAGS:-'13.0.10.Final 14.0.1.Final 14.0.6.Final 14.0.9.Final 14.0.13.Final 14.0.17.Final 14.0.19.Final 14.0'}
-KINDEST_NODE_VERSION=${KINDEST_NODE_VERSION:-'v1.22.17'}
+KINDEST_NODE_VERSION=${KINDEST_NODE_VERSION:-'v1.24.15'}
 KIND_SUBNET=${KIND_SUBNET-172.172.0.0}
 
 docker network create kind --subnet "${KIND_SUBNET}/16" || true
@@ -32,6 +32,10 @@ nodes:
     extraPortMappings:
       - containerPort: 30222
         hostPort: 11222
+    kubeadmConfigPatches:
+    - |
+      kind: KubeletConfiguration
+      cgroupDriver: cgroupfs
 EOF
 
 # connect the registry to the cluster network