From fa254ae507feead2024fa87b6f9b7a9fdc762f56 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 15 Oct 2025 08:45:41 +0200 Subject: [PATCH 1/2] Run integration tests against Kubernetes v1.34 --- .github/scripts/run-integration-tests-group1.sh | 4 ++-- .github/scripts/run-integration-tests-group2.sh | 4 ++-- .github/scripts/run-integration-tests.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/scripts/run-integration-tests-group1.sh b/.github/scripts/run-integration-tests-group1.sh index 48ab11be6b..293ad4b621 100755 --- a/.github/scripts/run-integration-tests-group1.sh +++ b/.github/scripts/run-integration-tests-group1.sh @@ -2,8 +2,8 @@ set -euxo pipefail -SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20250218120612-6f6111124902} -ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.32} +SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20251014082336-b8f11375258f} +ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.34} # install and prepare setup-envtest go install sigs.k8s.io/controller-runtime/tools/setup-envtest@"$SETUP_ENVTEST_VER" diff --git a/.github/scripts/run-integration-tests-group2.sh b/.github/scripts/run-integration-tests-group2.sh index 9a085a1d72..796b634757 100755 --- a/.github/scripts/run-integration-tests-group2.sh +++ b/.github/scripts/run-integration-tests-group2.sh @@ -2,8 +2,8 @@ set -euxo pipefail -SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20250218120612-6f6111124902} -ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.32} +SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20251014082336-b8f11375258f} +ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.34} # install and prepare setup-envtest go install sigs.k8s.io/controller-runtime/tools/setup-envtest@"$SETUP_ENVTEST_VER" diff --git a/.github/scripts/run-integration-tests.sh b/.github/scripts/run-integration-tests.sh index e0dd7561cc..8989094fb1 100755 --- a/.github/scripts/run-integration-tests.sh +++ b/.github/scripts/run-integration-tests.sh @@ -2,8 +2,8 @@ set -euxo pipefail -SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20250218120612-6f6111124902} -ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.32} +SETUP_ENVTEST_VER=${SETUP_ENVTEST_VER-v0.0.0-20251014082336-b8f11375258f} +ENVTEST_K8S_VERSION=${ENVTEST_K8S_VERSION-1.34} # install and prepare setup-envtest go install sigs.k8s.io/controller-runtime/tools/setup-envtest@"$SETUP_ENVTEST_VER" From 29289218edd196c9f6fdb47f18b59b2f9037c711 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Wed, 15 Oct 2025 08:57:09 +0200 Subject: [PATCH 2/2] Ensure proper handling of directory paths in integration test script --- .github/scripts/run-integration-tests-group2.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/run-integration-tests-group2.sh b/.github/scripts/run-integration-tests-group2.sh index 796b634757..f523e7aec8 100755 --- a/.github/scripts/run-integration-tests-group2.sh +++ b/.github/scripts/run-integration-tests-group2.sh @@ -15,5 +15,5 @@ find ./integrationtests -type d -not -path '*/.git*' \ -not -path './integrationtests/agent*' \ -not -path './integrationtests/bundlereader*' \ -not -path './integrationtests/cli*' \ - -not -path './integrationtests/controller*' | \ - xargs ginkgo --github-output --trace \ No newline at end of file + -not -path './integrationtests/controller*' -print0 | \ + xargs -0 ginkgo --github-output --trace \ No newline at end of file