From 867abb42c70ae7e6684fd5f6eb86d0f732a56954 Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Thu, 12 Dec 2024 00:40:49 +0000 Subject: [PATCH 1/5] support k8s v1.32.x Signed-off-by: Huabing Zhao --- .github/workflows/build_and_test.yaml | 10 +++++----- release-notes/current.yaml | 1 + site/content/en/news/releases/matrix.md | 2 +- site/content/zh/latest/install/matrix.md | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 7791b180b0c..c6997979fcb 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -85,7 +85,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ v1.28.13, v1.29.8, v1.30.4, v1.31.0 ] + version: [ v1.29.12, v1.30.8, v1.31.4, v1.32.0 ] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./tools/github-actions/setup-deps @@ -115,14 +115,14 @@ jobs: fail-fast: false matrix: target: - - version: v1.28.13 + - version: v1.29.12 ipFamily: ipv4 - - version: v1.29.8 + - version: v1.30.8 ipFamily: ipv4 - - version: v1.30.4 + - version: v1.31.4 ipFamily: ipv6 # only run ipv6 test on this version to save time # TODO: this's IPv4 first, need a way to test IPv6 first. - - version: v1.31.0 + - version: v1.32.0 ipFamily: dual # only run dual test on latest version to save time steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/release-notes/current.yaml b/release-notes/current.yaml index 123759f7a84..e15d43c5efb 100644 --- a/release-notes/current.yaml +++ b/release-notes/current.yaml @@ -34,3 +34,4 @@ deprecations: | # Other notable changes not covered by the above sections. Other changes: | [SecurityPolicy] Modify the JWT Provider Issuer validation constraint + Add support for Kubernetes 1.32.x in the test matrix, and remove support for Kubernetes 1.28.x. diff --git a/site/content/en/news/releases/matrix.md b/site/content/en/news/releases/matrix.md index 8fbb021322a..d798d85fb40 100644 --- a/site/content/en/news/releases/matrix.md +++ b/site/content/en/news/releases/matrix.md @@ -7,7 +7,7 @@ Envoy Gateway relies on the Envoy Proxy and the Gateway API, and runs within a K | Envoy Gateway version | Envoy Proxy version | Rate Limit version | Gateway API version | Kubernetes version | |-----------------------|-----------------------------|--------------------|---------------------|----------------------------| -| latest | **dev-latest** | **master** | **v1.2.0** | v1.28, v1.29, v1.30, v1.31 | +| latest | **dev-latest** | **master** | **v1.2.0** | v1.29, v1.30, v1.31, v1.32 | | v1.2 | **distroless-v1.32.1** | **28b1629a** | **v1.2.0** | v1.28, v1.29, v1.30, v1.31 | | v1.1 | **distroless-v1.31.0** | **91484c59** | **v1.1.0** | v1.27, v1.28, v1.29, v1.30 | | v1.0 | **distroless-v1.29.2** | **19f2079f** | **v1.0.0** | v1.26, v1.27, v1.28, v1.29 | diff --git a/site/content/zh/latest/install/matrix.md b/site/content/zh/latest/install/matrix.md index aa5a7e79cdd..54143a09df2 100644 --- a/site/content/zh/latest/install/matrix.md +++ b/site/content/zh/latest/install/matrix.md @@ -15,4 +15,4 @@ Envoy Gateway 依赖于 Envoy Proxy 和 Gateway API，并在 Kubernetes 集群 | v0.4.0 | **v1.26-latest** | **542a6047** | **v0.6.2** | v1.25, v1.26, v1.27 | | v0.3.0 | **v1.25-latest** | **f28024e3** | **v0.6.1** | v1.24, v1.25, v1.26 | | v0.2.0 | **v1.23-latest** | | **v0.5.1** | v1.24 | -| latest | **dev-latest** | **master** | **v1.0.0** | v1.26, v1.27, v1.28, v1.29 | +| latest | **dev-latest** | **master** | **v1.0.0** | v1.29, v1.30, v1.31, v1.32 | From 4b8a5cfb3d5b41383b0b34ac82d055feafb74f30 Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Thu, 12 Dec 2024 00:50:45 +0000 Subject: [PATCH 2/5] revert chinese docs Signed-off-by: Huabing Zhao --- site/content/zh/latest/install/matrix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/zh/latest/install/matrix.md b/site/content/zh/latest/install/matrix.md index 54143a09df2..aa5a7e79cdd 100644 --- a/site/content/zh/latest/install/matrix.md +++ b/site/content/zh/latest/install/matrix.md @@ -15,4 +15,4 @@ Envoy Gateway 依赖于 Envoy Proxy 和 Gateway API，并在 Kubernetes 集群 | v0.4.0 | **v1.26-latest** | **542a6047** | **v0.6.2** | v1.25, v1.26, v1.27 | | v0.3.0 | **v1.25-latest** | **f28024e3** | **v0.6.1** | v1.24, v1.25, v1.26 | | v0.2.0 | **v1.23-latest** | | **v0.5.1** | v1.24 | -| latest | **dev-latest** | **master** | **v1.0.0** | v1.29, v1.30, v1.31, v1.32 | +| latest | **dev-latest** | **master** | **v1.0.0** | v1.26, v1.27, v1.28, v1.29 | From 975c749528a5094e6d36d301eb1892f53b7739c7 Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Thu, 12 Dec 2024 01:13:39 +0000 Subject: [PATCH 3/5] fix test Signed-off-by: Huabing Zhao --- .github/workflows/build_and_test.yaml | 2 +- .github/workflows/experimental_conformance.yaml | 2 +- tools/hack/create-cluster.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index c6997979fcb..03a9b6bfafd 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -85,7 +85,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ v1.29.12, v1.30.8, v1.31.4, v1.32.0 ] + version: [ v1.29.10, v1.30.6, v1.31.4, v1.32.0 ] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./tools/github-actions/setup-deps diff --git a/.github/workflows/experimental_conformance.yaml b/.github/workflows/experimental_conformance.yaml index e2b43edfbba..f2de92a63b7 100644 --- a/.github/workflows/experimental_conformance.yaml +++ b/.github/workflows/experimental_conformance.yaml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: [ v1.28.13, v1.29.8, v1.30.4, v1.31.0 ] + version: [ v1.29.10, v1.30.6, v1.31.4, v1.32.0 ] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./tools/github-actions/setup-deps diff --git a/tools/hack/create-cluster.sh b/tools/hack/create-cluster.sh index d1601cb83b6..c779aa0d6f3 100755 --- a/tools/hack/create-cluster.sh +++ b/tools/hack/create-cluster.sh @@ -5,7 +5,7 @@ set -euo pipefail # Setup default values CLUSTER_NAME=${CLUSTER_NAME:-"envoy-gateway"} METALLB_VERSION=${METALLB_VERSION:-"v0.13.10"} -KIND_NODE_TAG=${KIND_NODE_TAG:-"v1.31.0"} +KIND_NODE_TAG=${KIND_NODE_TAG:-"v1.32.0"} NUM_WORKERS=${NUM_WORKERS:-""} IP_FAMILY=${IP_FAMILY:-"ipv4"} From 96f3cad151de58cc3dbbc2648148da6cfe0f572d Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Thu, 12 Dec 2024 01:17:52 +0000 Subject: [PATCH 4/5] fix test Signed-off-by: Huabing Zhao --- .github/workflows/build_and_test.yaml | 6 +++--- .github/workflows/latest_release.yaml | 2 +- .github/workflows/release.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 03a9b6bfafd..222cfbc42bd 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -115,9 +115,9 @@ jobs: fail-fast: false matrix: target: - - version: v1.29.12 + - version: v1.29.10 ipFamily: ipv4 - - version: v1.30.8 + - version: v1.30.6 ipFamily: ipv4 - version: v1.31.4 ipFamily: ipv6 # only run ipv6 test on this version to save time @@ -163,7 +163,7 @@ jobs: # Benchmark - name: Run Benchmark tests env: - KIND_NODE_TAG: v1.28.13 + KIND_NODE_TAG: v1.29.10 IMAGE_PULL_POLICY: IfNotPresent # Args for benchmark test BENCHMARK_RPS: 10000 diff --git a/.github/workflows/latest_release.yaml b/.github/workflows/latest_release.yaml index b6e7d4c6d3f..47de6b9af60 100644 --- a/.github/workflows/latest_release.yaml +++ b/.github/workflows/latest_release.yaml @@ -31,7 +31,7 @@ jobs: # Benchmark - name: Run Benchmark tests env: - KIND_NODE_TAG: v1.28.13 + KIND_NODE_TAG: v1.29.10 IMAGE_PULL_POLICY: IfNotPresent # Args for benchmark test BENCHMARK_RPS: 10000 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7aea9e9d700..47636612dbf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: # Benchmark - name: Run Benchmark tests env: - KIND_NODE_TAG: v1.28.13 + KIND_NODE_TAG: v1.29.10 IMAGE_PULL_POLICY: IfNotPresent # Args for benchmark test BENCHMARK_RPS: 10000 From 1fd16ed77f07c4b1508f7e23c6d727f8eaf0610a Mon Sep 17 00:00:00 2001 From: Huabing Zhao Date: Thu, 12 Dec 2024 08:59:18 +0000 Subject: [PATCH 5/5] address comment Signed-off-by: Huabing Zhao --- site/content/zh/latest/install/matrix.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/zh/latest/install/matrix.md b/site/content/zh/latest/install/matrix.md index aa5a7e79cdd..54143a09df2 100644 --- a/site/content/zh/latest/install/matrix.md +++ b/site/content/zh/latest/install/matrix.md @@ -15,4 +15,4 @@ Envoy Gateway 依赖于 Envoy Proxy 和 Gateway API，并在 Kubernetes 集群 | v0.4.0 | **v1.26-latest** | **542a6047** | **v0.6.2** | v1.25, v1.26, v1.27 | | v0.3.0 | **v1.25-latest** | **f28024e3** | **v0.6.1** | v1.24, v1.25, v1.26 | | v0.2.0 | **v1.23-latest** | | **v0.5.1** | v1.24 | -| latest | **dev-latest** | **master** | **v1.0.0** | v1.26, v1.27, v1.28, v1.29 | +| latest | **dev-latest** | **master** | **v1.0.0** | v1.29, v1.30, v1.31, v1.32 |