test/e2e: update kubernetes versions we test against

From 1.28 to 1.33. Not that 1.34 is already available, so we could use
it as well. This also update images versions and digests.

In addition, it changes a bit how the matrix is set and only runs beta
and alpha tests on latest and oldest versions.

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>

Author: vdemeester

.github/workflows/e2e-matrix.yml

@@ -17,36 +17,43 @@ jobs:
     strategy:
       fail-fast: false # Keep running if one leg fails.
       matrix:
-        k8s-name:
-        - k8s-oldest             # 1.28
-        - k8s-latest-minus-three # 1.29
-        - k8s-latest-minus-two   # 1.30
-        - k8s-latest-minus-one   # 1.31
-        - k8s-latest             # 1.32
-
-        feature-flags:
-        - stable
-        - beta
-        - alpha
-        # - prow-feature-flags  - this is tested today as a periodic job, but we could integrate it here
-
         include:
-        - k8s-name: k8s-oldest
-          k8s-version: v1.28.x
-        - k8s-name: k8s-latest-minus-three
-          k8s-version: v1.29.x
-        - k8s-name: k8s-latest-minus-two
-          k8s-version: v1.30.x
-        - k8s-name: k8s-latest-minus-one
-          k8s-version: v1.31.x
+        # latest : stable, beta, alpha
+        - k8s-name: k8s-latest
+          k8s-version: v1.33.x
+          feature-flags: stable
+        - k8s-name: k8s-latest
+          k8s-version: v1.33.x
+          feature-flags: beta
         - k8s-name: k8s-latest
+          k8s-version: v1.33.x
+          feature-flags: alpha
+        # minus-one : stable
+        - k8s-name: k8s-minus-one
           k8s-version: v1.32.x
-        - feature-flags: stable
-          env-file: prow
-        - feature-flags: alpha
-          env-file: prow-alpha
-        - feature-flags: beta
-          env-file: prow-beta
+          feature-flags: stable
+        # minus-two : stable
+        - k8s-name: k8s-minus-two
+          k8s-version: v1.31.x
+          feature-flags: stable
+        # minus-three : stable
+        - k8s-name: k8s-minus-three
+          k8s-version: v1.30.x
+          feature-flags: stable
+        # minus-four : stable
+        - k8s-name: k8s-minus-four
+          k8s-version: v1.29.x
+          feature-flags: stable
+        # oldest : stable, beta, alpha
+        - k8s-name: k8s-oldest
+          k8s-version: v1.28.x
+          feature-flags: stable
+        - k8s-name: k8s-oldest
+          k8s-version: v1.28.x
+          feature-flags: beta
+        - k8s-name: k8s-oldest
+          k8s-version: v1.28.x
+          feature-flags: alpha
     env:
       KO_DOCKER_REPO: registry.local:5000/tekton
       CLUSTER_DOMAIN: c${{ github.run_id }}.local
@@ -91,7 +98,7 @@ jobs:
           --nodes 3 \
           --k8s-version ${{ matrix.k8s-version }} \
           --e2e-script ./test/e2e-tests.sh \
-          --e2e-env ./test/e2e-tests-kind-${{ matrix.env-file }}.env
+          --e2e-env ./test/e2e-tests-kind-prow-${{ matrix.feature-flags }}.env
 
     - name: Upload test results
       uses: actions/upload-artifact@v4

hack/setup-kind.sh

@@ -95,18 +95,23 @@ case ${K8S_VERSION} in
     KIND_IMAGE="kindest/node:${K8S_VERSION}@${KIND_IMAGE_SHA}"
     ;;
   v1.30.x)
-    K8S_VERSION="1.30.10"
-    KIND_IMAGE_SHA="sha256:4de75d0e82481ea846c0ed1de86328d821c1e6a6a91ac37bf804e5313670e507"
+    K8S_VERSION="1.30.13"
+    KIND_IMAGE_SHA="sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648"
     KIND_IMAGE="kindest/node:${K8S_VERSION}@${KIND_IMAGE_SHA}"
     ;;
   v1.31.x)
-    K8S_VERSION="1.31.6"
-    KIND_IMAGE_SHA="sha256:28b7cbb993dfe093c76641a0c95807637213c9109b761f1d422c2400e22b8e87"
+    K8S_VERSION="1.31.12"
+    KIND_IMAGE_SHA="sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d"
     KIND_IMAGE="kindest/node:${K8S_VERSION}@${KIND_IMAGE_SHA}"
     ;;
   v1.32.x)
-    K8S_VERSION="1.32.2"
-    KIND_IMAGE_SHA="sha256:f226345927d7e348497136874b6d207e0b32cc52154ad8323129352923a3142f"
+    K8S_VERSION="1.32.8"
+    KIND_IMAGE_SHA="sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1"
+    KIND_IMAGE="kindest/node:${K8S_VERSION}@${KIND_IMAGE_SHA}"
+    ;;
+  v1.33.x)
+    K8S_VERSION="1.33.4"
+    KIND_IMAGE_SHA="sha256:0f5cc49c5e73c0c2bb6e2df56e7df189240d83cf94edfa30946482eb08ec57d2"
     KIND_IMAGE="kindest/node:${K8S_VERSION}@${KIND_IMAGE_SHA}"
     ;;
   *) abort "Unsupported version: ${K8S_VERSION}" ;;