From db432cccb83fac11d57e14ae4087e6f1adb21249 Mon Sep 17 00:00:00 2001 From: Sunjay Bhatia <5337253+sunjayBhatia@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:43:28 -0400 Subject: [PATCH] Bump kind node images to 1.31 and latest patches (#6643) Also updates compat matrix Signed-off-by: Sunjay Bhatia --- .github/workflows/prbuild.yaml | 12 ++++++------ changelogs/unreleased/6643-sunjayBhatia-small.md | 1 + site/content/resources/compatibility-matrix.md | 2 +- test/scripts/make-kind-cluster.sh | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 changelogs/unreleased/6643-sunjayBhatia-small.md diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml index 18b037357f4..57a70a245ae 100644 --- a/.github/workflows/prbuild.yaml +++ b/.github/workflows/prbuild.yaml @@ -138,11 +138,11 @@ jobs: # image to use) for each kubernetes_version value. include: - kubernetes_version: "kubernetes:latest" - node_image: "docker.io/kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e" + node_image: "docker.io/kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865" - kubernetes_version: "kubernetes:n-1" - node_image: "docker.io/kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8" + node_image: "docker.io/kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114" - kubernetes_version: "kubernetes:n-2" - node_image: "docker.io/kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0" + node_image: "docker.io/kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa" - config_type: "ConfigmapConfiguration" use_config_crd: "false" - config_type: "ContourConfiguration" @@ -203,11 +203,11 @@ jobs: # image to use) for each kubernetes_version value. include: - kubernetes_version: "kubernetes:latest" - node_image: "docker.io/kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e" + node_image: "docker.io/kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865" - kubernetes_version: "kubernetes:n-1" - node_image: "docker.io/kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8" + node_image: "docker.io/kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114" - kubernetes_version: "kubernetes:n-2" - node_image: "docker.io/kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0" + node_image: "docker.io/kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa" steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: diff --git a/changelogs/unreleased/6643-sunjayBhatia-small.md b/changelogs/unreleased/6643-sunjayBhatia-small.md new file mode 100644 index 00000000000..4d60cf2cafe --- /dev/null +++ b/changelogs/unreleased/6643-sunjayBhatia-small.md @@ -0,0 +1 @@ +Updates kind node image for e2e tests to Kubernetes 1.31. Supported/tested Kubernetes versions are now 1.31, 1.30, and 1.29. diff --git a/site/content/resources/compatibility-matrix.md b/site/content/resources/compatibility-matrix.md index e297e22dec7..5dfff84ed58 100644 --- a/site/content/resources/compatibility-matrix.md +++ b/site/content/resources/compatibility-matrix.md @@ -10,7 +10,7 @@ These combinations of versions are specifically tested in CI and supported by th | Contour Version | Envoy Version | Kubernetes Versions | Gateway API Version | | --------------- | :------------------- | ------------------- | --------------------| -| main | [1.31.0][60] | 1.30, 1.29, 1.28 | [1.1.0][111] | +| main | [1.31.0][60] | 1.31, 1.30, 1.29 | [1.1.0][111] | | 1.30.0 | [1.31.0][60] | 1.30, 1.29, 1.28 | [1.1.0][111] | | 1.29.2 | [1.30.4][59] | 1.29, 1.28, 1.27 | [1.0.0][110] | | 1.29.1 | [1.30.2][56] | 1.29, 1.28, 1.27 | [1.0.0][110] | diff --git a/test/scripts/make-kind-cluster.sh b/test/scripts/make-kind-cluster.sh index 796d6882619..3731ffdba5f 100755 --- a/test/scripts/make-kind-cluster.sh +++ b/test/scripts/make-kind-cluster.sh @@ -27,7 +27,7 @@ readonly KUBECTL=${KUBECTL:-kubectl} readonly MULTINODE_CLUSTER=${MULTINODE_CLUSTER:-"false"} readonly IPV6_CLUSTER=${IPV6_CLUSTER:-"false"} readonly SKIP_GATEWAY_API_INSTALL=${SKIP_GATEWAY_API_INSTALL:-"false"} -readonly NODEIMAGE=${NODEIMAGE:-"kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"} +readonly NODEIMAGE=${NODEIMAGE:-"kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865"} readonly CLUSTERNAME=${CLUSTERNAME:-contour-e2e} readonly WAITTIME=${WAITTIME:-5m}