From 026f528c1888ac4a1ac94688c0b7ca7e6c19f96d Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Tue, 17 Dec 2024 12:41:13 +0200 Subject: [PATCH 1/5] Drop k8s v1.28 from kind testing and update cluster version to 1.29 in e2e --- .github/workflows/kind-e2e.yaml | 3 ++- test/e2e-external-domain-tls-tests.sh | 2 +- test/e2e-tests.sh | 2 +- test/e2e-upgrade-tests.sh | 2 +- test/performance/performance-tests.sh | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index ef72fd16807b..c32c1a382a6b 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -82,8 +82,9 @@ jobs: fail-fast: false # Keep running if one leg fails. matrix: k8s-version: - - v1.28.x - v1.29.x + - v1.30.x + - v1.31.x ingress: - kourier diff --git a/test/e2e-external-domain-tls-tests.sh b/test/e2e-external-domain-tls-tests.sh index 33c86a0846fa..4ddf51b03046 100755 --- a/test/e2e-external-domain-tls-tests.sh +++ b/test/e2e-external-domain-tls-tests.sh @@ -162,7 +162,7 @@ function delete_dns_record() { } # Script entry point. -initialize "$@" --num-nodes=4 --enable-ha --cluster-version=1.28 +initialize "$@" --num-nodes=4 --enable-ha --cluster-version=1.29 # Run the tests header "Running tests" diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index 109e71e0e0b9..ce39de72e80e 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -28,7 +28,7 @@ source $(dirname "$0")/e2e-common.sh # Script entry point. -initialize --num-nodes=4 --enable-ha --cluster-version=1.28 "$@" +initialize --num-nodes=4 --enable-ha --cluster-version=1.29 "$@" # Run the tests header "Running tests" diff --git a/test/e2e-upgrade-tests.sh b/test/e2e-upgrade-tests.sh index e15ea761cdc6..5ea2d773e47c 100755 --- a/test/e2e-upgrade-tests.sh +++ b/test/e2e-upgrade-tests.sh @@ -42,7 +42,7 @@ function stage_test_resources() { # Skip installing istio as an add-on. # Skip installing a pvc as it is not used in upgrade tests # Skip installing a resource quota as it is not used in upgrade tests -PVC=0 QUOTA=0 initialize "$@" --num-nodes=4 --cluster-version=1.28 \ +PVC=0 QUOTA=0 initialize "$@" --num-nodes=4 --cluster-version=1.29 \ --install-latest-release # TODO(#2656): Reduce the timeout after we get this test to consistently passing. diff --git a/test/performance/performance-tests.sh b/test/performance/performance-tests.sh index e26ea79e2a88..035ae0de73c3 100755 --- a/test/performance/performance-tests.sh +++ b/test/performance/performance-tests.sh @@ -38,7 +38,7 @@ declare ARTIFACTS ns="default" -initialize --num-nodes=10 --cluster-version=1.28 "$@" +initialize --num-nodes=10 --cluster-version=1.29 "$@" function run_job() { local name=$1 From 4e0ef18d086e5aa99efc56732481dda349f5ab51 Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Tue, 17 Dec 2024 13:59:35 +0200 Subject: [PATCH 2/5] remove 1.29 --- .github/workflows/kind-e2e.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index c32c1a382a6b..7b66f5d8c966 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -82,7 +82,6 @@ jobs: fail-fast: false # Keep running if one leg fails. matrix: k8s-version: - - v1.29.x - v1.30.x - v1.31.x From fbdd1db122ecd60be29518313d33a46d40e4e69a Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Thu, 19 Dec 2024 10:51:21 +0200 Subject: [PATCH 3/5] add 1.29 back --- .github/workflows/kind-e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index 7b66f5d8c966..bbad7d396a28 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -82,8 +82,8 @@ jobs: fail-fast: false # Keep running if one leg fails. matrix: k8s-version: + - v1.29.x - v1.30.x - - v1.31.x ingress: - kourier From 843cd52d0208530b8ac282d2a92c3b446e29a83f Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Fri, 20 Dec 2024 13:58:19 +0200 Subject: [PATCH 4/5] revert chainguard-dev/actions/setup-kind to main --- .github/workflows/kind-e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index bbad7d396a28..7ea520a937b3 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -170,7 +170,7 @@ jobs: path: ~/artifacts - name: setup kind - uses: chainguard-dev/actions/setup-kind@1f79ee3c1d554f67a5344933e2cadfa4b58d300d + uses: chainguard-dev/actions/setup-kind@main with: k8s-version: ${{ matrix.k8s-version }} kind-worker-count: 4 From 9166d3b71ec7f99c2b0dacaa5a2ca430216f0f5b Mon Sep 17 00:00:00 2001 From: Stavros Kontopoulos Date: Fri, 20 Dec 2024 17:05:54 +0200 Subject: [PATCH 5/5] set min to 1.30 --- .github/workflows/kind-e2e.yaml | 2 +- test/e2e-external-domain-tls-tests.sh | 2 +- test/e2e-tests.sh | 2 +- test/e2e-upgrade-tests.sh | 2 +- test/performance/performance-tests.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index 7ea520a937b3..34f7fa02144b 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -82,8 +82,8 @@ jobs: fail-fast: false # Keep running if one leg fails. matrix: k8s-version: - - v1.29.x - v1.30.x + - v1.31.x ingress: - kourier diff --git a/test/e2e-external-domain-tls-tests.sh b/test/e2e-external-domain-tls-tests.sh index 4ddf51b03046..71ff537bde3b 100755 --- a/test/e2e-external-domain-tls-tests.sh +++ b/test/e2e-external-domain-tls-tests.sh @@ -162,7 +162,7 @@ function delete_dns_record() { } # Script entry point. -initialize "$@" --num-nodes=4 --enable-ha --cluster-version=1.29 +initialize "$@" --num-nodes=4 --enable-ha --cluster-version=1.30 # Run the tests header "Running tests" diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index ce39de72e80e..eae5c5c7dff9 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -28,7 +28,7 @@ source $(dirname "$0")/e2e-common.sh # Script entry point. -initialize --num-nodes=4 --enable-ha --cluster-version=1.29 "$@" +initialize --num-nodes=4 --enable-ha --cluster-version=1.30 "$@" # Run the tests header "Running tests" diff --git a/test/e2e-upgrade-tests.sh b/test/e2e-upgrade-tests.sh index 5ea2d773e47c..6c31fab1a816 100755 --- a/test/e2e-upgrade-tests.sh +++ b/test/e2e-upgrade-tests.sh @@ -42,7 +42,7 @@ function stage_test_resources() { # Skip installing istio as an add-on. # Skip installing a pvc as it is not used in upgrade tests # Skip installing a resource quota as it is not used in upgrade tests -PVC=0 QUOTA=0 initialize "$@" --num-nodes=4 --cluster-version=1.29 \ +PVC=0 QUOTA=0 initialize "$@" --num-nodes=4 --cluster-version=1.30 \ --install-latest-release # TODO(#2656): Reduce the timeout after we get this test to consistently passing. diff --git a/test/performance/performance-tests.sh b/test/performance/performance-tests.sh index 035ae0de73c3..5fd997f55d4b 100755 --- a/test/performance/performance-tests.sh +++ b/test/performance/performance-tests.sh @@ -38,7 +38,7 @@ declare ARTIFACTS ns="default" -initialize --num-nodes=10 --cluster-version=1.29 "$@" +initialize --num-nodes=10 --cluster-version=1.30 "$@" function run_job() { local name=$1