From 5612db993ee2e94b41e69f741e49b675b1265f5d Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Wed, 8 Jan 2025 10:04:58 -0500 Subject: [PATCH] bump kind node images to 1.32 and latest patches Signed-off-by: Steve Kriss --- .github/workflows/prbuild.yaml | 12 ++++++------ hack/actions/install-kubernetes-toolchain.sh | 6 +++--- site/content/resources/compatibility-matrix.md | 2 +- test/scripts/make-kind-cluster.sh | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/prbuild.yaml b/.github/workflows/prbuild.yaml index f7e30b81c06..d991b5367ee 100644 --- a/.github/workflows/prbuild.yaml +++ b/.github/workflows/prbuild.yaml @@ -114,11 +114,11 @@ jobs: # image to use) for each kubernetes_version value. include: - kubernetes_version: "kubernetes:latest" - node_image: "docker.io/kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865" + node_image: "docker.io/kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027" - kubernetes_version: "kubernetes:n-1" - node_image: "docker.io/kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114" + node_image: "docker.io/kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30" - kubernetes_version: "kubernetes:n-2" - node_image: "docker.io/kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa" + node_image: "docker.io/kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf" - config_type: "ConfigmapConfiguration" use_config_crd: "false" - config_type: "ContourConfiguration" @@ -173,11 +173,11 @@ jobs: # image to use) for each kubernetes_version value. include: - kubernetes_version: "kubernetes:latest" - node_image: "docker.io/kindest/node:v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865" + node_image: "docker.io/kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027" - kubernetes_version: "kubernetes:n-1" - node_image: "docker.io/kindest/node:v1.30.4@sha256:976ea815844d5fa93be213437e3ff5754cd599b040946b5cca43ca45c2047114" + node_image: "docker.io/kindest/node:v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30" - kubernetes_version: "kubernetes:n-2" - node_image: "docker.io/kindest/node:v1.29.8@sha256:d46b7aa29567e93b27f7531d258c372e829d7224b25e3fc6ffdefed12476d3aa" + node_image: "docker.io/kindest/node:v1.30.8@sha256:17cd608b3971338d9180b00776cb766c50d0a0b6b904ab4ff52fd3fc5c6369bf" steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/hack/actions/install-kubernetes-toolchain.sh b/hack/actions/install-kubernetes-toolchain.sh index 8a7eea88d0e..232194bb110 100755 --- a/hack/actions/install-kubernetes-toolchain.sh +++ b/hack/actions/install-kubernetes-toolchain.sh @@ -4,8 +4,8 @@ set -o errexit set -o nounset set -o pipefail -readonly KUBECTL_VERS="v1.31.0" -readonly KIND_VERS="v0.24.0" +readonly KUBECTL_VERS="v1.32.0" +readonly KIND_VERS="v0.26.0" readonly PROGNAME=$(basename $0) readonly CURL=${CURL:-curl} @@ -45,7 +45,7 @@ download \ chmod +x "${DESTDIR}/kind" download \ - "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERS}/bin/${OS}/amd64/kubectl" \ + "https://dl.k8s.io/release/${KUBECTL_VERS}/bin/${OS}/amd64/kubectl" \ "${DESTDIR}/kubectl" chmod +x "${DESTDIR}/kubectl" diff --git a/site/content/resources/compatibility-matrix.md b/site/content/resources/compatibility-matrix.md index 0ad1c307120..2c76ceb8d66 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.32.0][65] | 1.31, 1.30, 1.29 | [1.1.0][111] | +| main | [1.32.0][65] | 1.32, 1.31, 1.30 | [1.1.0][111] | | 1.30.1 | [1.31.3][64] | 1.30, 1.29, 1.28 | [1.1.0][111] | | 1.30.0 | [1.31.0][60] | 1.30, 1.29, 1.28 | [1.1.0][111] | | 1.29.3 | [1.30.7][63] | 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 3731ffdba5f..2a2402f5d96 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.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865"} +readonly NODEIMAGE=${NODEIMAGE:-"docker.io/kindest/node:v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027"} readonly CLUSTERNAME=${CLUSTERNAME:-contour-e2e} readonly WAITTIME=${WAITTIME:-5m}