Disable topology injector for k8s 1.35 by jukie · Pull Request #7830 · envoyproxy/gateway

jukie · 2025-12-27T21:02:02Z

What this PR does / why we need it:

The PodTopologyLabelsAdmission KEP is implemented and enabled by default for K8s v1.35+ so we can remove the admission webhook I previously added which has some edge cases anyways. This will be much more reliable and also removes the need for extra RBAC and code logic for the controller. We can fully deprecate the internal topology injector code at k8s v1.39 (we officially support 4 k8s versions) so by around 2027 January-ish.
Adds CI worklfow targets for k8s v1.35 (cherry-picks from ci: add tests for Kubernetes 1.35 #7788 @beckcl)

Which issue(s) this PR fixes:

Release Notes: Yes

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

- add Kubernetes 1.35 conformance, e2e, and envtests tests - drop Kubernetes 1.31 conformance, e2e, and envtests tests Signed-off-by: Clemens Beck <mail@beckcl.dev>

Fix failing CEL validation tests related to changed error handling in K8s 1.35. The pattern changed from: `Invalid value: \"object\": <detailed error>` to: `Invalid value: <detailed error>` Signed-off-by: Clemens Beck <mail@beckcl.dev>

fixes the expected error message to match validation annotation at https://github.com/envoyproxy/gateway/blob/2901f8243ec0c12d7d34a943f137984f0d3c50ea/api/v1alpha1/healthcheck_types.go#L171 Signed-off-by: Clemens Beck <mail@beckcl.dev>

codecov · 2025-12-27T21:13:34Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.71%. Comparing base (e7bea5b) to head (d6defd4).
⚠️ Report is 294 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #7830   +/-   ##
=======================================
  Coverage   72.70%   72.71%           
=======================================
  Files         235      235           
  Lines       35100    35104    +4     
=======================================
+ Hits        25521    25526    +5     
+ Misses       7761     7760    -1     
  Partials     1818     1818

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

jukie · 2025-12-28T00:17:24Z

.github/workflows/build_and_test.yaml

-        - version: v1.31.12
+        - version: v1.32.11
          ipFamily: ipv4
          profile: default
-        - version: v1.32.8
+        - version: v1.33.7
          ipFamily: ipv4
          profile: default
-        - version: v1.33.4
+        - version: v1.34.3
          ipFamily: ipv6  # only run ipv6 test on this version to save time
          profile: default
        # TODO: this's IPv4 first, need a way to test IPv6 first.
-        - version: v1.34.2
+        - version: v1.35.0
          ipFamily: dual  # only run dual test on latest version to save time
          profile: default
-        - version: v1.34.2
+        - version: v1.35.0
          ipFamily: dual  # only run dual test on latest version to save time
          profile: gateway-namespace-mode
-        - version: v1.34.2
+        - version: v1.35.0


FYI this also includes a bump for the following:

1.32.8 --> 1.32.8

1.33.4 --> 1.33.7

1.34.2 --> 1.34.3

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

jukie · 2025-12-28T01:40:03Z

/retest

jukie · 2025-12-28T02:54:21Z

/retest

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

Signed-off-by: Isaac Wilson <10012479+jukie@users.noreply.github.com>

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

jukie · 2025-12-29T15:29:35Z

/retest

Signed-off-by: Isaac Wilson <10012479+jukie@users.noreply.github.com>

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

arkodg · 2026-01-01T23:31:11Z

should we wait until v1.34 EOLs to add this in ?

jukie · 2026-01-02T04:39:32Z

I'd be open to it, I think a case could be made for either direction. If we waited we could then do all the changes at once and wouldn't have to support a mixed mode like this.

github-actions · 2026-02-01T04:42:03Z

This pull request has been automatically marked as stale because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, when it's ready. Thank you for your contributions!

jukie and others added 5 commits December 27, 2025 14:01

Disable topology injector for k8s 1.35

284d35e

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

Merge branch 'main' into topology-injector-k8s-1_35

6ceeb9e

ci: add tests for Kubernetes 1.35

afa5afe

- add Kubernetes 1.35 conformance, e2e, and envtests tests - drop Kubernetes 1.31 conformance, e2e, and envtests tests Signed-off-by: Clemens Beck <mail@beckcl.dev>

fix cel validation tests on K8s 1.35

19fb653

Fix failing CEL validation tests related to changed error handling in K8s 1.35. The pattern changed from: `Invalid value: \"object\": <detailed error>` to: `Invalid value: <detailed error>` Signed-off-by: Clemens Beck <mail@beckcl.dev>

fix path validation test

ec43208

fixes the expected error message to match validation annotation at https://github.com/envoyproxy/gateway/blob/2901f8243ec0c12d7d34a943f137984f0d3c50ea/api/v1alpha1/healthcheck_types.go#L171 Signed-off-by: Clemens Beck <mail@beckcl.dev>

fix cel tests

0dffc0a

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

jukie force-pushed the topology-injector-k8s-1_35 branch from f8c4ed7 to 0dffc0a Compare December 28, 2025 00:12

jukie marked this pull request as ready for review December 28, 2025 00:15

jukie requested a review from a team as a code owner December 28, 2025 00:15

jukie requested a review from a team December 28, 2025 00:15

jukie commented Dec 28, 2025

View reviewed changes

notes

6e371d6

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

jukie force-pushed the topology-injector-k8s-1_35 branch from eafde73 to 6e371d6 Compare December 28, 2025 00:18

jukie marked this pull request as draft December 28, 2025 06:32

jukie added 3 commits December 28, 2025 10:21

Fix 1.35

c7fb870

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

Update CEL string match

a8b5eea

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

add bugfix release note and remove extra files

a6a2ab9

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

jukie force-pushed the topology-injector-k8s-1_35 branch from 6f66129 to a6a2ab9 Compare December 28, 2025 17:44

jukie and others added 4 commits December 28, 2025 10:45

Merge branch 'main' into topology-injector-k8s-1_35

e556798

Merge branch 'main' into topology-injector-k8s-1_35

0182948

Signed-off-by: Isaac Wilson <10012479+jukie@users.noreply.github.com>

fix quotes

9f3f3cb

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

comments

35cda57

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

jukie and others added 2 commits December 29, 2025 21:15

Merge branch 'main' into topology-injector-k8s-1_35

af94c0c

Signed-off-by: Isaac Wilson <10012479+jukie@users.noreply.github.com>

Remove CI changes after merging separately

d6defd4

Signed-off-by: jukie <10012479+Jukie@users.noreply.github.com>

github-actions bot added the stale label Feb 1, 2026

6ixfalls mentioned this pull request Feb 15, 2026

chore: revert double-quoted zone names (#6133) #8184

Closed

github-actions bot closed this Mar 15, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disable topology injector for k8s 1.35#7830

Disable topology injector for k8s 1.35#7830
jukie wants to merge 16 commits intoenvoyproxy:mainfrom
jukie:topology-injector-k8s-1_35

jukie commented Dec 27, 2025 •

edited

Loading

Uh oh!

codecov bot commented Dec 27, 2025 •

edited

Loading

Uh oh!

jukie Dec 28, 2025

Uh oh!

jukie commented Dec 28, 2025

Uh oh!

jukie commented Dec 28, 2025

Uh oh!

jukie commented Dec 29, 2025

Uh oh!

arkodg commented Jan 1, 2026

Uh oh!

jukie commented Jan 2, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Feb 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

jukie commented Dec 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Dec 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jukie Dec 28, 2025

Choose a reason for hiding this comment

Uh oh!

jukie commented Dec 28, 2025

Uh oh!

jukie commented Dec 28, 2025

Uh oh!

jukie commented Dec 29, 2025

Uh oh!

arkodg commented Jan 1, 2026

Uh oh!

jukie commented Jan 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Feb 1, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jukie commented Dec 27, 2025 •

edited

Loading

codecov bot commented Dec 27, 2025 •

edited

Loading

jukie commented Jan 2, 2026 •

edited

Loading