From 6aa4b570307683e52776a7fae2bb3407a672d9a7 Mon Sep 17 00:00:00 2001 From: Tam Mach Date: Wed, 22 Jan 2025 14:37:38 +1100 Subject: [PATCH 1/2] docs: Update cilium envoy version matrix Signed-off-by: Tam Mach --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f8b936c67..ae071a0b9 100644 --- a/README.md +++ b/README.md @@ -14,12 +14,19 @@ Other combinations may work but are not tested. | Cilium Version | Envoy version | |----------------|---------------| -| (main) | v1.31.x | +| (main) | v1.32.x | +| v1.17.0 | v1.31.5 | +| v1.16.7 | v1.31.5 | +| v1.16.6 | v1.30.9 | +| v1.16.5 | v1.30.8 | | v1.16.4 | v1.30.6 | | v1.16.3 | v1.29.9 | | v1.16.2 | v1.29.9 | | v1.16.1 | v1.29.7 | | v1.16.0 | v1.29.7 | +| v1.15.14 | v1.31.5 | +| v1.15.13 | v1.30.9 | +| v1.15.12 | v1.30.8 | | v1.15.11 | v1.30.6 | | v1.15.10 | v1.29.9 | | v1.15.9 | v1.29.9 | @@ -32,6 +39,9 @@ Other combinations may work but are not tested. | v1.15.2 | v1.27.3 | | v1.15.1 | v1.27.3 | | v1.15.0 | v1.27.2 | +| v1.14.20 | v1.31.5 | +| v1.14.19 | v1.30.9 | +| v1.14.18 | v1.30.8 | | v1.14.17 | v1.30.6 | | v1.14.16 | v1.29.9 | | v1.14.15 | v1.29.9 | From 03978febc390467d6b6c7885b1adc908440b11a6 Mon Sep 17 00:00:00 2001 From: Tam Mach Date: Wed, 22 Jan 2025 14:51:45 +1100 Subject: [PATCH 2/2] renovate: Remove v1.30 branch configuration Signed-off-by: Tam Mach --- .github/renovate.json5 | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index db22af17a..ed1f1a559 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -25,7 +25,6 @@ baseBranches: [ 'main', 'v1.31', - 'v1.30' ], labels: [ 'kind/enhancement', @@ -59,7 +58,6 @@ matchBaseBranches: [ 'main', 'v1.31', - 'v1.30', ], }, { @@ -79,7 +77,6 @@ matchBaseBranches: [ 'main', 'v1.31', - 'v1.30', ], }, { @@ -94,7 +91,6 @@ matchBaseBranches: [ 'main', 'v1.31', - 'v1.30', ], }, { @@ -120,29 +116,6 @@ 'v1.31' ], }, - { - matchFileNames: [ - 'Dockerfile.builder', - '.github/workflows/**' - ], - matchPackageNames: [ - 'go', - ], - allowedVersions: '<=1.22', - matchBaseBranches: [ - 'v1.30', - ], - }, - { - groupName: 'envoy 1.30.x', - matchDepNames: [ - 'envoyproxy/envoy', - ], - allowedVersions: '<=1.30', - matchBaseBranches: [ - 'v1.30', - ], - }, { groupName: 'envoy 1.31.x', matchDepNames: [