Skip to content

Commit

Permalink
Bump kind/kubectl and node images (projectcontour#6444)
Browse files Browse the repository at this point in the history
Also fix gateway-api version in versions.yaml and compat matrix

Signed-off-by: Sunjay Bhatia <sunjayb@vmware.com>
Signed-off-by: Saman Mahdanian <saman@mahdanian.xyz>
  • Loading branch information
sunjayBhatia authored and SamMHD committed Sep 8, 2024
1 parent 93b7858 commit f90fe48
Showing 6 changed files with 15 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/prbuild.yaml
Original file line number Diff line number Diff line change
@@ -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.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
node_image: "docker.io/kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
- kubernetes_version: "kubernetes:n-1"
node_image: "docker.io/kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58"
node_image: "docker.io/kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8"
- kubernetes_version: "kubernetes:n-2"
node_image: "docker.io/kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
node_image: "docker.io/kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0"
- 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.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"
node_image: "docker.io/kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"
- kubernetes_version: "kubernetes:n-1"
node_image: "docker.io/kindest/node:v1.28.7@sha256:9bc6c451a289cf96ad0bbaf33d416901de6fd632415b076ab05f5fa7e4f65c58"
node_image: "docker.io/kindest/node:v1.29.4@sha256:3abb816a5b1061fb15c6e9e60856ec40d56b7b52bcea5f5f1350bc6e2320b6f8"
- kubernetes_version: "kubernetes:n-2"
node_image: "docker.io/kindest/node:v1.27.11@sha256:681253009e68069b8e01aad36a1e0fa8cf18bb0ab3e5c4069b2e65cafdd70843"
node_image: "docker.io/kindest/node:v1.28.9@sha256:dca54bc6a6079dd34699d53d7d4ffa2e853e46a20cd12d619a09207e35300bd0"
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
1 change: 1 addition & 0 deletions changelogs/unreleased/6444-sunjayBhatia-small.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updates to Kubernetes 1.30. Supported/tested Kubernetes versions are now 1.28, 1.29, and 1.30.
4 changes: 2 additions & 2 deletions hack/actions/install-kubernetes-toolchain.sh
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ set -o errexit
set -o nounset
set -o pipefail

readonly KUBECTL_VERS="v1.29.2"
readonly KIND_VERS="v0.22.0"
readonly KUBECTL_VERS="v1.30.0"
readonly KIND_VERS="v0.23.0"

readonly PROGNAME=$(basename $0)
readonly CURL=${CURL:-curl}
5 changes: 3 additions & 2 deletions site/content/resources/compatibility-matrix.md
Original file line number Diff line number Diff line change
@@ -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.30.1][53] | 1.29, 1.28, 1.27 | [1.0.0][110] |
| main | [1.30.1][53] | 1.30, 1.29, 1.28 | [1.1.0][111] |
| 1.29.0 | [1.30.1][53] | 1.29, 1.28, 1.27 | [1.0.0][110] |
| 1.28.4 | [1.29.4][55] | 1.29, 1.28, 1.27 | [1.0.0][110] |
| 1.28.3 | [1.29.3][50] | 1.29, 1.28, 1.27 | [1.0.0][110] |
@@ -209,4 +209,5 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1
[107]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.6.2
[108]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.8.0
[109]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.8.1
[110]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v1.0.0
[110]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v1.0.0
[111]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v1.1.0
2 changes: 1 addition & 1 deletion test/scripts/make-kind-cluster.sh
Original file line number Diff line number Diff line change
@@ -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.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245"}
readonly NODEIMAGE=${NODEIMAGE:-"kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e"}
readonly CLUSTERNAME=${CLUSTERNAME:-contour-e2e}
readonly WAITTIME=${WAITTIME:-5m}

4 changes: 2 additions & 2 deletions versions.yaml
Original file line number Diff line number Diff line change
@@ -9,11 +9,11 @@ versions:
dependencies:
envoy: "1.30.1"
kubernetes:
- "1.30"
- "1.29"
- "1.28"
- "1.27"
gateway-api:
- "1.0.0"
- "1.1.0"
- version: v1.29.0
supported: "true"
dependencies:

0 comments on commit f90fe48

Please sign in to comment.