Repository: kumahq/kuma
Pull request #12811 (2025-02-10 21:25:32)

test(e2e): changed MeshGatewayRoute to MeshHTTPRoute
## Motivation

MeshGatewayRoute is deprecated in favor of MeshHTTPRoute.

Fix: https://github.com/kumahq/kuma/issues/12763


github-actions[bot]: ## Reviewer Checklist
:mag: Each of these sections need to be checked by the reviewer of the PR :mag::
If something doesn't apply please check the box and add a justification if the reason is non obvious.
- [ ] Is the PR title satisfactory? Is this part of a larger feature and should be grouped using `> Changelog`?
- [ ] PR description is clear and complete. It [Links to relevant issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) as well as docs and UI issues
- [ ] This will not break child repos: it doesn't hardcode values (.e.g "kumahq" as an image registry)
- [ ] IPv6 is taken into account (.e.g: no string concatenation of host port)
- [ ] Tests (Unit test, E2E tests, manual test on universal and k8s)
    - Don't forget `ci/` labels to run additional/fewer tests
- [ ] Does this contain a change that needs to be notified to users? In this case, [`UPGRADE.md`](../blob/master/UPGRADE.md) should be updated.
- [ ] Does it need to be backported according to the [backporting policy](../blob/master/CONTRIBUTING.md#backporting)? ([this](https://github.com/kumahq/kuma/actions/workflows/auto-backport.yaml) GH action will add "backport" label based on these [file globs](https://github.com/kumahq/kuma/blob/master/.github/workflows/auto-backport.yaml#L6), if you want to prevent it from adding the "backport" label use [no-backport-autolabel](https://github.com/kumahq/kuma/blob/master/.github/workflows/auto-backport.yaml#L8) label)
<!-- Sticky Pull Request CommentPR reviewer checklist -->

Patch:
diff --git a/deployments/charts/kuma/crds/kuma.io_circuitbreakers.yaml b/deployments/charts/kuma/crds/kuma.io_circuitbreakers.yaml
index d6b2a6759..9b206c9fe 100644
--- a/deployments/charts/kuma/crds/kuma.io_circuitbreakers.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_circuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_containerpatches.yaml b/deployments/charts/kuma/crds/kuma.io_containerpatches.yaml
index 4ce4c0872..5c0a798bb 100644
--- a/deployments/charts/kuma/crds/kuma.io_containerpatches.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_containerpatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: containerpatches.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_dataplaneinsights.yaml b/deployments/charts/kuma/crds/kuma.io_dataplaneinsights.yaml
index 25b83f5d4..853b640f8 100644
--- a/deployments/charts/kuma/crds/kuma.io_dataplaneinsights.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_dataplaneinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_dataplanes.yaml b/deployments/charts/kuma/crds/kuma.io_dataplanes.yaml
index be838dd1f..932800df7 100644
--- a/deployments/charts/kuma/crds/kuma.io_dataplanes.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_dataplanes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplanes.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_externalservices.yaml b/deployments/charts/kuma/crds/kuma.io_externalservices.yaml
index a87695280..8c4460361 100644
--- a/deployments/charts/kuma/crds/kuma.io_externalservices.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_externalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: externalservices.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_faultinjections.yaml b/deployments/charts/kuma/crds/kuma.io_faultinjections.yaml
index a7563c7c9..680584531 100644
--- a/deployments/charts/kuma/crds/kuma.io_faultinjections.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_faultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: faultinjections.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_healthchecks.yaml b/deployments/charts/kuma/crds/kuma.io_healthchecks.yaml
index dd8c6aa7a..838c31f5c 100644
--- a/deployments/charts/kuma/crds/kuma.io_healthchecks.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_healthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: healthchecks.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_hostnamegenerators.yaml b/deployments/charts/kuma/crds/kuma.io_hostnamegenerators.yaml
index 4a382b1d4..497b8a66e 100644
--- a/deployments/charts/kuma/crds/kuma.io_hostnamegenerators.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_hostnamegenerators.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml b/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml
index 693fffe42..d66807e4d 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshaccesslogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml b/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml
index 4f8115e90..9b4e75357 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshcircuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshes.yaml b/deployments/charts/kuma/crds/kuma.io_meshes.yaml
index cdc88ed49..776a1adec 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshes.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshes.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshexternalservices.yaml b/deployments/charts/kuma/crds/kuma.io_meshexternalservices.yaml
index 5bdd9d870..bc8ce81ab 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshexternalservices.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshexternalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml b/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml
index 91b823434..a236d1567 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshfaultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshgatewayconfigs.yaml b/deployments/charts/kuma/crds/kuma.io_meshgatewayconfigs.yaml
index 47e6ab0da..712c2ec5e 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshgatewayconfigs.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshgatewayconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayconfigs.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshgatewayinstances.yaml b/deployments/charts/kuma/crds/kuma.io_meshgatewayinstances.yaml
index 5fb53e871..57f3dcafb 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshgatewayinstances.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshgatewayinstances.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayinstances.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshgatewayroutes.yaml b/deployments/charts/kuma/crds/kuma.io_meshgatewayroutes.yaml
index c4d0dd854..7b54c19b0 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshgatewayroutes.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshgatewayroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayroutes.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshgateways.yaml b/deployments/charts/kuma/crds/kuma.io_meshgateways.yaml
index 788f8356b..398419cba 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshgateways.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshgateways.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgateways.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml b/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml
index 4cf81de67..71d21017a 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshhealthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml b/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml
index 33834eba2..b828bfda4 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshhttproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshinsights.yaml b/deployments/charts/kuma/crds/kuma.io_meshinsights.yaml
index 120f16a07..f7ebf5db4 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshinsights.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml b/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml
index be1c36e9e..4ed8a06a5 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshloadbalancingstrategies.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml b/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml
index e1b51382b..d89d93114 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshmetrics.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshmultizoneservices.yaml b/deployments/charts/kuma/crds/kuma.io_meshmultizoneservices.yaml
index 3113e1c67..e2ed523d9 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshmultizoneservices.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshmultizoneservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml b/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml
index 66e4be9a7..535eeb477 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshpassthroughs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml b/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml
index d6c3c1a14..47278db05 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshproxypatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml b/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml
index 6acef2e14..5b4a1a50a 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshretries.yaml b/deployments/charts/kuma/crds/kuma.io_meshretries.yaml
index 912ca643d..7a4d29e2f 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshretries.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshretries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshretries.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshservices.yaml b/deployments/charts/kuma/crds/kuma.io_meshservices.yaml
index 72ac8db3b..c64b0c061 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshservices.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshservices.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml b/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml
index f35ba92fe..49170f3c5 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshtcproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml b/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml
index 89f3a782c..44d8bed1a 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshtimeouts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml b/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml
index f2ba5b635..35e3cd6f2 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshtlses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml b/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml
index c93d9ca46..3bebb85ca 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshtraces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml b/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml
index 9e910c1fc..2f13a81a9 100644
--- a/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_meshtrafficpermissions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_proxytemplates.yaml b/deployments/charts/kuma/crds/kuma.io_proxytemplates.yaml
index 41d9a0ad0..a0e99aa4e 100644
--- a/deployments/charts/kuma/crds/kuma.io_proxytemplates.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_proxytemplates.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: proxytemplates.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_ratelimits.yaml b/deployments/charts/kuma/crds/kuma.io_ratelimits.yaml
index f77aca841..b31b7f714 100644
--- a/deployments/charts/kuma/crds/kuma.io_ratelimits.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_ratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: ratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_retries.yaml b/deployments/charts/kuma/crds/kuma.io_retries.yaml
index 33edfbd61..25d1b4bd4 100644
--- a/deployments/charts/kuma/crds/kuma.io_retries.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_retries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: retries.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_serviceinsights.yaml b/deployments/charts/kuma/crds/kuma.io_serviceinsights.yaml
index 287b41cb3..464bbbdf0 100644
--- a/deployments/charts/kuma/crds/kuma.io_serviceinsights.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_serviceinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: serviceinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_timeouts.yaml b/deployments/charts/kuma/crds/kuma.io_timeouts.yaml
index 44b83172b..ad68bd184 100644
--- a/deployments/charts/kuma/crds/kuma.io_timeouts.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_timeouts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: timeouts.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_trafficlogs.yaml b/deployments/charts/kuma/crds/kuma.io_trafficlogs.yaml
index 9c3d91c9d..bbc43ef7a 100644
--- a/deployments/charts/kuma/crds/kuma.io_trafficlogs.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_trafficlogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficlogs.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_trafficpermissions.yaml b/deployments/charts/kuma/crds/kuma.io_trafficpermissions.yaml
index 50d2bc990..2cc0373d6 100644
--- a/deployments/charts/kuma/crds/kuma.io_trafficpermissions.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_trafficpermissions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficpermissions.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_trafficroutes.yaml b/deployments/charts/kuma/crds/kuma.io_trafficroutes.yaml
index 4c91a7b3b..7025bc885 100644
--- a/deployments/charts/kuma/crds/kuma.io_trafficroutes.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_trafficroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficroutes.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_traffictraces.yaml b/deployments/charts/kuma/crds/kuma.io_traffictraces.yaml
index 34f8825b7..402e69cb8 100644
--- a/deployments/charts/kuma/crds/kuma.io_traffictraces.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_traffictraces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: traffictraces.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_virtualoutbounds.yaml b/deployments/charts/kuma/crds/kuma.io_virtualoutbounds.yaml
index b0013e59e..ccea04f1b 100644
--- a/deployments/charts/kuma/crds/kuma.io_virtualoutbounds.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_virtualoutbounds.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: virtualoutbounds.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_zoneegresses.yaml b/deployments/charts/kuma/crds/kuma.io_zoneegresses.yaml
index 970ba3a7f..53f88d9a8 100644
--- a/deployments/charts/kuma/crds/kuma.io_zoneegresses.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_zoneegresses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegresses.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_zoneegressinsights.yaml b/deployments/charts/kuma/crds/kuma.io_zoneegressinsights.yaml
index 5c018ac7f..3443c1f2d 100644
--- a/deployments/charts/kuma/crds/kuma.io_zoneegressinsights.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_zoneegressinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegressinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_zoneingresses.yaml b/deployments/charts/kuma/crds/kuma.io_zoneingresses.yaml
index 0902d259d..770eb29c9 100644
--- a/deployments/charts/kuma/crds/kuma.io_zoneingresses.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_zoneingresses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingresses.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_zoneingressinsights.yaml b/deployments/charts/kuma/crds/kuma.io_zoneingressinsights.yaml
index a5e9412ec..fb76d9573 100644
--- a/deployments/charts/kuma/crds/kuma.io_zoneingressinsights.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_zoneingressinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingressinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_zoneinsights.yaml b/deployments/charts/kuma/crds/kuma.io_zoneinsights.yaml
index 745d76380..287130be4 100644
--- a/deployments/charts/kuma/crds/kuma.io_zoneinsights.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_zoneinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/deployments/charts/kuma/crds/kuma.io_zones.yaml b/deployments/charts/kuma/crds/kuma.io_zones.yaml
index 745545891..371e05905 100644
--- a/deployments/charts/kuma/crds/kuma.io_zones.yaml
+++ b/deployments/charts/kuma/crds/kuma.io_zones.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zones.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_circuitbreakers.yaml b/docs/generated/raw/crds/kuma.io_circuitbreakers.yaml
index d6b2a6759..9b206c9fe 100644
--- a/docs/generated/raw/crds/kuma.io_circuitbreakers.yaml
+++ b/docs/generated/raw/crds/kuma.io_circuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_containerpatches.yaml b/docs/generated/raw/crds/kuma.io_containerpatches.yaml
index 4ce4c0872..5c0a798bb 100644
--- a/docs/generated/raw/crds/kuma.io_containerpatches.yaml
+++ b/docs/generated/raw/crds/kuma.io_containerpatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: containerpatches.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_dataplaneinsights.yaml b/docs/generated/raw/crds/kuma.io_dataplaneinsights.yaml
index 25b83f5d4..853b640f8 100644
--- a/docs/generated/raw/crds/kuma.io_dataplaneinsights.yaml
+++ b/docs/generated/raw/crds/kuma.io_dataplaneinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_dataplanes.yaml b/docs/generated/raw/crds/kuma.io_dataplanes.yaml
index be838dd1f..932800df7 100644
--- a/docs/generated/raw/crds/kuma.io_dataplanes.yaml
+++ b/docs/generated/raw/crds/kuma.io_dataplanes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplanes.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_externalservices.yaml b/docs/generated/raw/crds/kuma.io_externalservices.yaml
index a87695280..8c4460361 100644
--- a/docs/generated/raw/crds/kuma.io_externalservices.yaml
+++ b/docs/generated/raw/crds/kuma.io_externalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: externalservices.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_faultinjections.yaml b/docs/generated/raw/crds/kuma.io_faultinjections.yaml
index a7563c7c9..680584531 100644
--- a/docs/generated/raw/crds/kuma.io_faultinjections.yaml
+++ b/docs/generated/raw/crds/kuma.io_faultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: faultinjections.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_healthchecks.yaml b/docs/generated/raw/crds/kuma.io_healthchecks.yaml
index dd8c6aa7a..838c31f5c 100644
--- a/docs/generated/raw/crds/kuma.io_healthchecks.yaml
+++ b/docs/generated/raw/crds/kuma.io_healthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: healthchecks.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_hostnamegenerators.yaml b/docs/generated/raw/crds/kuma.io_hostnamegenerators.yaml
index 4a382b1d4..497b8a66e 100644
--- a/docs/generated/raw/crds/kuma.io_hostnamegenerators.yaml
+++ b/docs/generated/raw/crds/kuma.io_hostnamegenerators.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml b/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml
index 693fffe42..d66807e4d 100644
--- a/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshaccesslogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml b/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml
index 4f8115e90..9b4e75357 100644
--- a/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshcircuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshes.yaml b/docs/generated/raw/crds/kuma.io_meshes.yaml
index cdc88ed49..776a1adec 100644
--- a/docs/generated/raw/crds/kuma.io_meshes.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshes.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshexternalservices.yaml b/docs/generated/raw/crds/kuma.io_meshexternalservices.yaml
index 5bdd9d870..bc8ce81ab 100644
--- a/docs/generated/raw/crds/kuma.io_meshexternalservices.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshexternalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml b/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml
index 91b823434..a236d1567 100644
--- a/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshfaultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshgatewayconfigs.yaml b/docs/generated/raw/crds/kuma.io_meshgatewayconfigs.yaml
index 47e6ab0da..712c2ec5e 100644
--- a/docs/generated/raw/crds/kuma.io_meshgatewayconfigs.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshgatewayconfigs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayconfigs.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshgatewayinstances.yaml b/docs/generated/raw/crds/kuma.io_meshgatewayinstances.yaml
index 5fb53e871..57f3dcafb 100644
--- a/docs/generated/raw/crds/kuma.io_meshgatewayinstances.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshgatewayinstances.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayinstances.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshgatewayroutes.yaml b/docs/generated/raw/crds/kuma.io_meshgatewayroutes.yaml
index c4d0dd854..7b54c19b0 100644
--- a/docs/generated/raw/crds/kuma.io_meshgatewayroutes.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshgatewayroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayroutes.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshgateways.yaml b/docs/generated/raw/crds/kuma.io_meshgateways.yaml
index 788f8356b..398419cba 100644
--- a/docs/generated/raw/crds/kuma.io_meshgateways.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshgateways.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgateways.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml b/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml
index 4cf81de67..71d21017a 100644
--- a/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshhealthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml b/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml
index 33834eba2..b828bfda4 100644
--- a/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshhttproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshinsights.yaml b/docs/generated/raw/crds/kuma.io_meshinsights.yaml
index 120f16a07..f7ebf5db4 100644
--- a/docs/generated/raw/crds/kuma.io_meshinsights.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml b/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml
index be1c36e9e..4ed8a06a5 100644
--- a/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshloadbalancingstrategies.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshmetrics.yaml b/docs/generated/raw/crds/kuma.io_meshmetrics.yaml
index e1b51382b..d89d93114 100644
--- a/docs/generated/raw/crds/kuma.io_meshmetrics.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshmetrics.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshmultizoneservices.yaml b/docs/generated/raw/crds/kuma.io_meshmultizoneservices.yaml
index 3113e1c67..e2ed523d9 100644
--- a/docs/generated/raw/crds/kuma.io_meshmultizoneservices.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshmultizoneservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml b/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml
index 66e4be9a7..535eeb477 100644
--- a/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshpassthroughs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml b/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml
index d6c3c1a14..47278db05 100644
--- a/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshproxypatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshratelimits.yaml b/docs/generated/raw/crds/kuma.io_meshratelimits.yaml
index 6acef2e14..5b4a1a50a 100644
--- a/docs/generated/raw/crds/kuma.io_meshratelimits.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshretries.yaml b/docs/generated/raw/crds/kuma.io_meshretries.yaml
index 912ca643d..7a4d29e2f 100644
--- a/docs/generated/raw/crds/kuma.io_meshretries.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshretries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshretries.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshservices.yaml b/docs/generated/raw/crds/kuma.io_meshservices.yaml
index 72ac8db3b..c64b0c061 100644
--- a/docs/generated/raw/crds/kuma.io_meshservices.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshservices.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml b/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml
index f35ba92fe..49170f3c5 100644
--- a/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshtcproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml b/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml
index 89f3a782c..44d8bed1a 100644
--- a/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshtimeouts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshtlses.yaml b/docs/generated/raw/crds/kuma.io_meshtlses.yaml
index f2ba5b635..35e3cd6f2 100644
--- a/docs/generated/raw/crds/kuma.io_meshtlses.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshtlses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshtraces.yaml b/docs/generated/raw/crds/kuma.io_meshtraces.yaml
index c93d9ca46..3bebb85ca 100644
--- a/docs/generated/raw/crds/kuma.io_meshtraces.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshtraces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml b/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml
index 9e910c1fc..2f13a81a9 100644
--- a/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml
+++ b/docs/generated/raw/crds/kuma.io_meshtrafficpermissions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_proxytemplates.yaml b/docs/generated/raw/crds/kuma.io_proxytemplates.yaml
index 41d9a0ad0..a0e99aa4e 100644
--- a/docs/generated/raw/crds/kuma.io_proxytemplates.yaml
+++ b/docs/generated/raw/crds/kuma.io_proxytemplates.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: proxytemplates.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_ratelimits.yaml b/docs/generated/raw/crds/kuma.io_ratelimits.yaml
index f77aca841..b31b7f714 100644
--- a/docs/generated/raw/crds/kuma.io_ratelimits.yaml
+++ b/docs/generated/raw/crds/kuma.io_ratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: ratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_retries.yaml b/docs/generated/raw/crds/kuma.io_retries.yaml
index 33edfbd61..25d1b4bd4 100644
--- a/docs/generated/raw/crds/kuma.io_retries.yaml
+++ b/docs/generated/raw/crds/kuma.io_retries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: retries.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_serviceinsights.yaml b/docs/generated/raw/crds/kuma.io_serviceinsights.yaml
index 287b41cb3..464bbbdf0 100644
--- a/docs/generated/raw/crds/kuma.io_serviceinsights.yaml
+++ b/docs/generated/raw/crds/kuma.io_serviceinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: serviceinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_timeouts.yaml b/docs/generated/raw/crds/kuma.io_timeouts.yaml
index 44b83172b..ad68bd184 100644
--- a/docs/generated/raw/crds/kuma.io_timeouts.yaml
+++ b/docs/generated/raw/crds/kuma.io_timeouts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: timeouts.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_trafficlogs.yaml b/docs/generated/raw/crds/kuma.io_trafficlogs.yaml
index 9c3d91c9d..bbc43ef7a 100644
--- a/docs/generated/raw/crds/kuma.io_trafficlogs.yaml
+++ b/docs/generated/raw/crds/kuma.io_trafficlogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficlogs.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_trafficpermissions.yaml b/docs/generated/raw/crds/kuma.io_trafficpermissions.yaml
index 50d2bc990..2cc0373d6 100644
--- a/docs/generated/raw/crds/kuma.io_trafficpermissions.yaml
+++ b/docs/generated/raw/crds/kuma.io_trafficpermissions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficpermissions.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_trafficroutes.yaml b/docs/generated/raw/crds/kuma.io_trafficroutes.yaml
index 4c91a7b3b..7025bc885 100644
--- a/docs/generated/raw/crds/kuma.io_trafficroutes.yaml
+++ b/docs/generated/raw/crds/kuma.io_trafficroutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficroutes.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_traffictraces.yaml b/docs/generated/raw/crds/kuma.io_traffictraces.yaml
index 34f8825b7..402e69cb8 100644
--- a/docs/generated/raw/crds/kuma.io_traffictraces.yaml
+++ b/docs/generated/raw/crds/kuma.io_traffictraces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: traffictraces.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_virtualoutbounds.yaml b/docs/generated/raw/crds/kuma.io_virtualoutbounds.yaml
index b0013e59e..ccea04f1b 100644
--- a/docs/generated/raw/crds/kuma.io_virtualoutbounds.yaml
+++ b/docs/generated/raw/crds/kuma.io_virtualoutbounds.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: virtualoutbounds.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_zoneegresses.yaml b/docs/generated/raw/crds/kuma.io_zoneegresses.yaml
index 970ba3a7f..53f88d9a8 100644
--- a/docs/generated/raw/crds/kuma.io_zoneegresses.yaml
+++ b/docs/generated/raw/crds/kuma.io_zoneegresses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegresses.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_zoneegressinsights.yaml b/docs/generated/raw/crds/kuma.io_zoneegressinsights.yaml
index 5c018ac7f..3443c1f2d 100644
--- a/docs/generated/raw/crds/kuma.io_zoneegressinsights.yaml
+++ b/docs/generated/raw/crds/kuma.io_zoneegressinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegressinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_zoneingresses.yaml b/docs/generated/raw/crds/kuma.io_zoneingresses.yaml
index 0902d259d..770eb29c9 100644
--- a/docs/generated/raw/crds/kuma.io_zoneingresses.yaml
+++ b/docs/generated/raw/crds/kuma.io_zoneingresses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingresses.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_zoneingressinsights.yaml b/docs/generated/raw/crds/kuma.io_zoneingressinsights.yaml
index a5e9412ec..fb76d9573 100644
--- a/docs/generated/raw/crds/kuma.io_zoneingressinsights.yaml
+++ b/docs/generated/raw/crds/kuma.io_zoneingressinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingressinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_zoneinsights.yaml b/docs/generated/raw/crds/kuma.io_zoneinsights.yaml
index 745d76380..287130be4 100644
--- a/docs/generated/raw/crds/kuma.io_zoneinsights.yaml
+++ b/docs/generated/raw/crds/kuma.io_zoneinsights.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneinsights.kuma.io
 spec:
   group: kuma.io
diff --git a/docs/generated/raw/crds/kuma.io_zones.yaml b/docs/generated/raw/crds/kuma.io_zones.yaml
index 745545891..371e05905 100644
--- a/docs/generated/raw/crds/kuma.io_zones.yaml
+++ b/docs/generated/raw/crds/kuma.io_zones.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zones.kuma.io
 spec:
   group: kuma.io
diff --git a/go.mod b/go.mod
index d61370128..65f7011b3 100644
--- a/go.mod
+++ b/go.mod
@@ -71,7 +71,7 @@ require (
 	golang.org/x/net v0.34.0
 	golang.org/x/sync v0.11.0
 	golang.org/x/sys v0.30.0
-	golang.org/x/text v0.21.0
+	golang.org/x/text v0.22.0
 	gonum.org/v1/gonum v0.15.1
 	google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287
@@ -88,7 +88,7 @@ require (
 	k8s.io/kubectl v0.32.1
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
 	sigs.k8s.io/controller-runtime v0.20.1
-	sigs.k8s.io/controller-tools v0.17.1
+	sigs.k8s.io/controller-tools v0.17.2
 	// When updating this also update version in: test/framework/k8s.go
 	sigs.k8s.io/gateway-api v1.2.1
 	sigs.k8s.io/yaml v1.4.0
diff --git a/go.sum b/go.sum
index 3b0e84be1..5150929eb 100644
--- a/go.sum
+++ b/go.sum
@@ -586,8 +586,8 @@ golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
 golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
 golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -653,8 +653,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
 k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
 sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
-sigs.k8s.io/controller-tools v0.17.1 h1:bQ+dKCS7jY9AgpefenBDtm6geJZCHVKbegpLynxgyus=
-sigs.k8s.io/controller-tools v0.17.1/go.mod h1:3QXAdrmdxYuQ4MifvbCAFD9wLXn7jylnfBPYS4yVDdc=
+sigs.k8s.io/controller-tools v0.17.2 h1:jNFOKps8WnaRKZU2R+4vRCHnXyJanVmXBWqkuUPFyFg=
+sigs.k8s.io/controller-tools v0.17.2/go.mod h1:4q5tZG2JniS5M5bkiXY2/potOiXyhoZVw/U48vLkXk0=
 sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
 sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
diff --git a/mk/dependencies/deps.lock b/mk/dependencies/deps.lock
index 8edc74418..66fb4a31f 100644
--- a/mk/dependencies/deps.lock
+++ b/mk/dependencies/deps.lock
@@ -1,1 +1,1 @@
-c01b21c0d56fb1dd1c479fa16f58610f3ac89c39
+31ea47c4295e2f0a859208fe5c4aa19d80151626
diff --git a/mk/dependencies/go-deps.versions b/mk/dependencies/go-deps.versions
index d9bc6eb85..1c804b71d 100644
--- a/mk/dependencies/go-deps.versions
+++ b/mk/dependencies/go-deps.versions
@@ -4,7 +4,7 @@ google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
 github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema@v0.0.0-20230606235304-e35f2ad05c0c
 github.com/envoyproxy/protoc-gen-validate@v1.2.1
 github.com/onsi/ginkgo/v2/ginkgo@v2.22.2
-sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.1
+sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2
 github.com/mikefarah/yq/v4@v4.30.8
 github.com/norwoodj/helm-docs/cmd/helm-docs@v1.11.0
 golang.stackrox.io/kube-linter/cmd/kube-linter@v0.6.5
diff --git a/pkg/core/resources/apis/donothingresource/k8s/crd/kuma.io_donothingresources.yaml b/pkg/core/resources/apis/donothingresource/k8s/crd/kuma.io_donothingresources.yaml
index eef1a468c..b26e91aba 100644
--- a/pkg/core/resources/apis/donothingresource/k8s/crd/kuma.io_donothingresources.yaml
+++ b/pkg/core/resources/apis/donothingresource/k8s/crd/kuma.io_donothingresources.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: donothingresources.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/core/resources/apis/hostnamegenerator/k8s/crd/kuma.io_hostnamegenerators.yaml b/pkg/core/resources/apis/hostnamegenerator/k8s/crd/kuma.io_hostnamegenerators.yaml
index 4a382b1d4..497b8a66e 100644
--- a/pkg/core/resources/apis/hostnamegenerator/k8s/crd/kuma.io_hostnamegenerators.yaml
+++ b/pkg/core/resources/apis/hostnamegenerator/k8s/crd/kuma.io_hostnamegenerators.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/core/resources/apis/meshexternalservice/k8s/crd/kuma.io_meshexternalservices.yaml b/pkg/core/resources/apis/meshexternalservice/k8s/crd/kuma.io_meshexternalservices.yaml
index 5bdd9d870..bc8ce81ab 100644
--- a/pkg/core/resources/apis/meshexternalservice/k8s/crd/kuma.io_meshexternalservices.yaml
+++ b/pkg/core/resources/apis/meshexternalservice/k8s/crd/kuma.io_meshexternalservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/core/resources/apis/meshmultizoneservice/k8s/crd/kuma.io_meshmultizoneservices.yaml b/pkg/core/resources/apis/meshmultizoneservice/k8s/crd/kuma.io_meshmultizoneservices.yaml
index 3113e1c67..e2ed523d9 100644
--- a/pkg/core/resources/apis/meshmultizoneservice/k8s/crd/kuma.io_meshmultizoneservices.yaml
+++ b/pkg/core/resources/apis/meshmultizoneservice/k8s/crd/kuma.io_meshmultizoneservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/core/resources/apis/meshservice/k8s/crd/kuma.io_meshservices.yaml b/pkg/core/resources/apis/meshservice/k8s/crd/kuma.io_meshservices.yaml
index 72ac8db3b..c64b0c061 100644
--- a/pkg/core/resources/apis/meshservice/k8s/crd/kuma.io_meshservices.yaml
+++ b/pkg/core/resources/apis/meshservice/k8s/crd/kuma.io_meshservices.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshservices.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml b/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml
index e95403a6b..4f9870f9c 100644
--- a/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml
+++ b/pkg/plugins/policies/donothingpolicy/k8s/crd/kuma.io_donothingpolicies.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: donothingpolicies.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml b/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml
index 693fffe42..d66807e4d 100644
--- a/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml
+++ b/pkg/plugins/policies/meshaccesslog/k8s/crd/kuma.io_meshaccesslogs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml b/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml
index 4f8115e90..9b4e75357 100644
--- a/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml
+++ b/pkg/plugins/policies/meshcircuitbreaker/k8s/crd/kuma.io_meshcircuitbreakers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml b/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml
index 91b823434..a236d1567 100644
--- a/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml
+++ b/pkg/plugins/policies/meshfaultinjection/k8s/crd/kuma.io_meshfaultinjections.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml b/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml
index 4cf81de67..71d21017a 100644
--- a/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml
+++ b/pkg/plugins/policies/meshhealthcheck/k8s/crd/kuma.io_meshhealthchecks.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml b/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml
index 33834eba2..b828bfda4 100644
--- a/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml
+++ b/pkg/plugins/policies/meshhttproute/k8s/crd/kuma.io_meshhttproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml b/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml
index be1c36e9e..4ed8a06a5 100644
--- a/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml
+++ b/pkg/plugins/policies/meshloadbalancingstrategy/k8s/crd/kuma.io_meshloadbalancingstrategies.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml b/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml
index e1b51382b..d89d93114 100644
--- a/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml
+++ b/pkg/plugins/policies/meshmetric/k8s/crd/kuma.io_meshmetrics.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml b/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml
index 66e4be9a7..535eeb477 100644
--- a/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml
+++ b/pkg/plugins/policies/meshpassthrough/k8s/crd/kuma.io_meshpassthroughs.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml b/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml
index d6c3c1a14..47278db05 100644
--- a/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml
+++ b/pkg/plugins/policies/meshproxypatch/k8s/crd/kuma.io_meshproxypatches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml b/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml
index 6acef2e14..5b4a1a50a 100644
--- a/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml
+++ b/pkg/plugins/policies/meshratelimit/k8s/crd/kuma.io_meshratelimits.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml b/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml
index 912ca643d..7a4d29e2f 100644
--- a/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml
+++ b/pkg/plugins/policies/meshretry/k8s/crd/kuma.io_meshretries.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshretries.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml b/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml
index f35ba92fe..49170f3c5 100644
--- a/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml
+++ b/pkg/plugins/policies/meshtcproute/k8s/crd/kuma.io_meshtcproutes.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml b/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml
index 89f3a782c..44d8bed1a 100644
--- a/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml
+++ b/pkg/plugins/policies/meshtimeout/k8s/crd/kuma.io_meshtimeouts.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml b/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml
index f2ba5b635..35e3cd6f2 100644
--- a/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml
+++ b/pkg/plugins/policies/meshtls/k8s/crd/kuma.io_meshtlses.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml b/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml
index c93d9ca46..3bebb85ca 100644
--- a/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml
+++ b/pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml b/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml
index 9e910c1fc..2f13a81a9 100644
--- a/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml
+++ b/pkg/plugins/policies/meshtrafficpermission/k8s/crd/kuma.io_meshtrafficpermissions.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
diff --git a/pkg/xds/auth/callbacks.go b/pkg/xds/auth/callbacks.go
index 4578111a4..e581150f1 100644
--- a/pkg/xds/auth/callbacks.go
+++ b/pkg/xds/auth/callbacks.go
@@ -59,7 +59,8 @@ type stream struct {
 	// Dataplane / ZoneIngress / ZoneEgress associated with this XDS stream.
 	resource model.Resource
 	// nodeID of the stream. Has to be the same for the whole life of a stream.
-	nodeID string
+	nodeID        string
+	authenticated bool
 }
 
 var _ util_xds.Callbacks = &authCallbacks{}
@@ -87,12 +88,15 @@ func (a *authCallbacks) OnStreamRequest(streamID core_xds.StreamID, req util_xds
 		return err
 	}
 
-	credential, err := ExtractCredential(s.ctx)
-	if err != nil {
-		return errors.Wrap(err, "could not extract credential from DiscoveryRequest")
-	}
-	if err := a.authenticator.Authenticate(user.Ctx(s.ctx, user.ControlPlane), s.resource, credential); err != nil {
-		return errors.Wrap(err, "authentication failed")
+	if !s.authenticated {
+		credential, err := ExtractCredential(s.ctx)
+		if err != nil {
+			return errors.Wrap(err, "could not extract credential from DiscoveryRequest")
+		}
+		if err := a.authenticator.Authenticate(user.Ctx(s.ctx, user.ControlPlane), s.resource, credential); err != nil {
+			return errors.Wrap(err, "authentication failed")
+		}
+		s.authenticated = true
 	}
 	a.Lock()
 	a.streams[streamID] = s
diff --git a/pkg/xds/auth/k8s/authenticator.go b/pkg/xds/auth/k8s/authenticator.go
index 2fc6f9ca7..7d8867565 100644
--- a/pkg/xds/auth/k8s/authenticator.go
+++ b/pkg/xds/auth/k8s/authenticator.go
@@ -2,50 +2,38 @@ package k8s
 
 import (
 	"context"
+	"fmt"
 	"strings"
-	"time"
 
-	"github.com/goburrow/cache"
 	"github.com/pkg/errors"
 	kube_auth "k8s.io/api/authentication/v1"
 	kube_core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	kube_client "sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/kumahq/kuma/pkg/core"
 	core_mesh "github.com/kumahq/kuma/pkg/core/resources/apis/mesh"
 	"github.com/kumahq/kuma/pkg/core/resources/model"
-	util_cache "github.com/kumahq/kuma/pkg/util/cache"
 	util_k8s "github.com/kumahq/kuma/pkg/util/k8s"
 	"github.com/kumahq/kuma/pkg/xds/auth"
 	xds_metrics "github.com/kumahq/kuma/pkg/xds/metrics"
 )
 
-func New(client kube_client.Client, metrics *xds_metrics.Metrics) auth.Authenticator {
-	authCache := cache.New(
-		cache.WithExpireAfterAccess(1*time.Hour),
-		cache.WithMaximumSize(100000),
-		cache.WithStatsCounter(&util_cache.PrometheusStatsCounter{Metric: metrics.KubeAuthCache}),
-	)
+var log = core.Log.WithName("kube-token-validator")
 
+func New(client kube_client.Client, metrics *xds_metrics.Metrics) auth.Authenticator {
 	return &kubeAuthenticator{
-		client:        client,
-		authenticated: authCache,
+		client: client,
 	}
 }
 
 type kubeAuthenticator struct {
 	client kube_client.Client
-
-	authenticated cache.Cache
 }
 
 var _ auth.Authenticator = &kubeAuthenticator{}
 
 func (k *kubeAuthenticator) Authenticate(ctx context.Context, resource model.Resource, credential auth.Credential) error {
-	if _, authenticated := k.authenticated.GetIfPresent(credential); authenticated {
-		return nil
-	}
-
 	var err error
 	switch resource := resource.(type) {
 	case *core_mesh.DataplaneResource, *core_mesh.ZoneIngressResource, *core_mesh.ZoneEgressResource:
@@ -57,54 +45,63 @@ func (k *kubeAuthenticator) Authenticate(ctx context.Context, resource model.Res
 	if err != nil {
 		return err
 	}
-
-	k.authenticated.Put(credential, struct{}{})
 	return nil
 }
 
-func (k *kubeAuthenticator) verifyToken(ctx context.Context, credential auth.Credential, proxyNamespace, serviceAccountName string) error {
+func (k *kubeAuthenticator) authResource(ctx context.Context, resource model.Resource, credential auth.Credential) error {
+	resourceName := resource.GetMeta().GetName()
+	podName, podNamespace, err := util_k8s.CoreNameToK8sName(resourceName)
+	if err != nil {
+		return err
+	}
+
+	serviceAccountName, err := k.podServiceAccountName(ctx, podName, podNamespace)
+	if err != nil {
+		return err
+	}
+
 	tokenReview := &kube_auth.TokenReview{
 		Spec: kube_auth.TokenReviewSpec{
 			Token: credential,
 		},
 	}
+
 	if err := k.client.Create(ctx, tokenReview); err != nil {
-		return errors.Wrap(err, "call to TokenReview API failed")
+		log.Error(err, "could not call Kubernetes API Server to verify dataplane token",
+			"proxy", resourceName, "serviceAccountName", serviceAccountName)
+		return errors.New("could not call Kubernetes API Server to verify dataplane token")
 	}
 	if !tokenReview.Status.Authenticated {
-		return errors.Errorf("token doesn't belong to a valid user")
+		log.Info("[WARNING] fail to verify dataplane token", "error", tokenReview.Status.Error)
+		return errors.Errorf("dataplane token verification failed with an error")
 	}
+
+	serviceAccountAuthErr := errors.Errorf("invalid service account token")
 	userInfo := strings.Split(tokenReview.Status.User.Username, ":")
 	if len(userInfo) != 4 {
-		return errors.Errorf("username inside TokenReview response has unexpected format: %q", tokenReview.Status.User.Username)
-	}
-	if !(userInfo[0] == "system" && userInfo[1] == "serviceaccount") {
-		return errors.Errorf("user %q is not a service account", tokenReview.Status.User.Username)
+		log.Info(fmt.Sprintf("[WARNING] invalid service account token: username inside TokenReview response has unexpected format: %q",
+			tokenReview.Status.User.Username), "proxy", resourceName, "serviceAccountName", serviceAccountName)
+		return serviceAccountAuthErr
 	}
-	namespace := userInfo[2]
-	if namespace != proxyNamespace {
-		return errors.Errorf("token belongs to a namespace %q different from proxyId %q", namespace, proxyNamespace)
-	}
-	name := userInfo[3]
-	if name != serviceAccountName {
-		return errors.Errorf("service account name of the pod %q is different than token that was provided %q", serviceAccountName, name)
-	}
-	return nil
-}
 
-func (k *kubeAuthenticator) authResource(ctx context.Context, resource model.Resource, credential auth.Credential) error {
-	name, namespace, err := util_k8s.CoreNameToK8sName(resource.GetMeta().GetName())
-	if err != nil {
-		return err
+	if !(userInfo[0] == "system" && userInfo[1] == "serviceaccount") {
+		log.Info(fmt.Sprintf("[WARNING] invalid service account token: user %q is not a service account", tokenReview.Status.User.Username),
+			"proxy", resourceName, "serviceAccountName", serviceAccountName)
+		return serviceAccountAuthErr
 	}
 
-	serviceAccountName, err := k.podServiceAccountName(ctx, name, namespace)
-	if err != nil {
-		return err
+	tokenSANamespace := userInfo[2]
+	if tokenSANamespace != podNamespace {
+		log.Info(fmt.Sprintf("[WARNING] invalid service account token: token belongs to a namespace %q different from proxyId %q", tokenSANamespace, podNamespace),
+			"proxy", resourceName, "serviceAccountName", serviceAccountName)
+		return serviceAccountAuthErr
 	}
 
-	if err := k.verifyToken(ctx, credential, namespace, serviceAccountName); err != nil {
-		return errors.Wrap(err, "authentication failed")
+	tokenSAName := userInfo[3]
+	if tokenSAName != serviceAccountName {
+		log.Info(fmt.Sprintf("[WARNING] invalid service account token: service account name in token %q does not match pod service account", tokenSAName),
+			"proxy", resourceName, "serviceAccountName", serviceAccountName)
+		return serviceAccountAuthErr
 	}
 
 	return nil


Test patch:
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
index 81616e997..d1262734a 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -36,7 +36,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io
@@ -86,7 +86,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: containerpatches.kuma.io
 spec:
   group: kuma.io
@@ -200,7 +200,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshes.kuma.io
 spec:
   group: kuma.io
@@ -252,7 +252,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
@@ -587,7 +587,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
@@ -1012,7 +1012,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayconfigs.kuma.io
 spec:
   group: kuma.io
@@ -1239,7 +1239,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayinstances.kuma.io
 spec:
   group: kuma.io
@@ -1595,7 +1595,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayroutes.kuma.io
 spec:
   group: kuma.io
@@ -1645,7 +1645,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgateways.kuma.io
 spec:
   group: kuma.io
@@ -1697,7 +1697,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
@@ -2083,7 +2083,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
@@ -2757,7 +2757,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshinsights.kuma.io
 spec:
   group: kuma.io
@@ -2807,7 +2807,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io
@@ -2857,7 +2857,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
@@ -3435,7 +3435,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
@@ -3730,7 +3730,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
@@ -3931,7 +3931,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
@@ -4099,7 +4099,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
@@ -4652,7 +4652,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
@@ -5283,7 +5283,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshretries.kuma.io
 spec:
   group: kuma.io
@@ -5794,7 +5794,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshservices.kuma.io
 spec:
   group: kuma.io
@@ -6014,7 +6014,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
@@ -6301,7 +6301,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
@@ -6727,7 +6727,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplanes.kuma.io
 spec:
   group: kuma.io
@@ -6799,7 +6799,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
@@ -7099,7 +7099,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
@@ -7385,7 +7385,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -7592,7 +7592,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: proxytemplates.kuma.io
 spec:
   group: kuma.io
@@ -7642,7 +7642,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: ratelimits.kuma.io
 spec:
   group: kuma.io
@@ -7692,7 +7692,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: retries.kuma.io
 spec:
   group: kuma.io
@@ -7742,7 +7742,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: serviceinsights.kuma.io
 spec:
   group: kuma.io
@@ -7792,7 +7792,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: timeouts.kuma.io
 spec:
   group: kuma.io
@@ -7842,7 +7842,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficlogs.kuma.io
 spec:
   group: kuma.io
@@ -7892,7 +7892,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -7942,7 +7942,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: externalservices.kuma.io
 spec:
   group: kuma.io
@@ -7992,7 +7992,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficroutes.kuma.io
 spec:
   group: kuma.io
@@ -8042,7 +8042,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: traffictraces.kuma.io
 spec:
   group: kuma.io
@@ -8092,7 +8092,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: virtualoutbounds.kuma.io
 spec:
   group: kuma.io
@@ -8142,7 +8142,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegresses.kuma.io
 spec:
   group: kuma.io
@@ -8200,7 +8200,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegressinsights.kuma.io
 spec:
   group: kuma.io
@@ -8250,7 +8250,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingresses.kuma.io
 spec:
   group: kuma.io
@@ -8308,7 +8308,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingressinsights.kuma.io
 spec:
   group: kuma.io
@@ -8359,7 +8359,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneinsights.kuma.io
 spec:
   group: kuma.io
@@ -8409,7 +8409,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zones.kuma.io
 spec:
   group: kuma.io
@@ -8459,7 +8459,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: faultinjections.kuma.io
 spec:
   group: kuma.io
@@ -8509,7 +8509,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: healthchecks.kuma.io
 spec:
   group: kuma.io
@@ -8559,7 +8559,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
@@ -8633,7 +8633,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
@@ -9351,7 +9351,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
index d076944f8..7bf785781 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
@@ -36,7 +36,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io
@@ -86,7 +86,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: containerpatches.kuma.io
 spec:
   group: kuma.io
@@ -200,7 +200,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshes.kuma.io
 spec:
   group: kuma.io
@@ -252,7 +252,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
@@ -587,7 +587,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
@@ -1012,7 +1012,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayconfigs.kuma.io
 spec:
   group: kuma.io
@@ -1239,7 +1239,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayinstances.kuma.io
 spec:
   group: kuma.io
@@ -1595,7 +1595,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayroutes.kuma.io
 spec:
   group: kuma.io
@@ -1645,7 +1645,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgateways.kuma.io
 spec:
   group: kuma.io
@@ -1697,7 +1697,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
@@ -2083,7 +2083,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
@@ -2757,7 +2757,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshinsights.kuma.io
 spec:
   group: kuma.io
@@ -2807,7 +2807,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io
@@ -2857,7 +2857,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
@@ -3435,7 +3435,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
@@ -3730,7 +3730,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
@@ -3931,7 +3931,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
@@ -4099,7 +4099,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
@@ -4652,7 +4652,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
@@ -5283,7 +5283,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshretries.kuma.io
 spec:
   group: kuma.io
@@ -5794,7 +5794,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshservices.kuma.io
 spec:
   group: kuma.io
@@ -6014,7 +6014,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
@@ -6301,7 +6301,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
@@ -6727,7 +6727,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplanes.kuma.io
 spec:
   group: kuma.io
@@ -6799,7 +6799,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
@@ -7099,7 +7099,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
@@ -7385,7 +7385,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -7592,7 +7592,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: proxytemplates.kuma.io
 spec:
   group: kuma.io
@@ -7642,7 +7642,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: ratelimits.kuma.io
 spec:
   group: kuma.io
@@ -7692,7 +7692,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: retries.kuma.io
 spec:
   group: kuma.io
@@ -7742,7 +7742,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: serviceinsights.kuma.io
 spec:
   group: kuma.io
@@ -7792,7 +7792,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: timeouts.kuma.io
 spec:
   group: kuma.io
@@ -7842,7 +7842,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficlogs.kuma.io
 spec:
   group: kuma.io
@@ -7892,7 +7892,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -7942,7 +7942,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: externalservices.kuma.io
 spec:
   group: kuma.io
@@ -7992,7 +7992,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficroutes.kuma.io
 spec:
   group: kuma.io
@@ -8042,7 +8042,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: traffictraces.kuma.io
 spec:
   group: kuma.io
@@ -8092,7 +8092,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: virtualoutbounds.kuma.io
 spec:
   group: kuma.io
@@ -8142,7 +8142,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegresses.kuma.io
 spec:
   group: kuma.io
@@ -8200,7 +8200,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegressinsights.kuma.io
 spec:
   group: kuma.io
@@ -8250,7 +8250,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingresses.kuma.io
 spec:
   group: kuma.io
@@ -8308,7 +8308,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingressinsights.kuma.io
 spec:
   group: kuma.io
@@ -8359,7 +8359,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneinsights.kuma.io
 spec:
   group: kuma.io
@@ -8409,7 +8409,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zones.kuma.io
 spec:
   group: kuma.io
@@ -8459,7 +8459,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: faultinjections.kuma.io
 spec:
   group: kuma.io
@@ -8509,7 +8509,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: healthchecks.kuma.io
 spec:
   group: kuma.io
@@ -8559,7 +8559,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
@@ -8633,7 +8633,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
@@ -9351,7 +9351,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
index 00bc317d9..c89108a8e 100644
--- a/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
+++ b/app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
@@ -56,7 +56,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io
@@ -106,7 +106,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: containerpatches.kuma.io
 spec:
   group: kuma.io
@@ -220,7 +220,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshes.kuma.io
 spec:
   group: kuma.io
@@ -272,7 +272,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
@@ -607,7 +607,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
@@ -1032,7 +1032,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayconfigs.kuma.io
 spec:
   group: kuma.io
@@ -1259,7 +1259,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayinstances.kuma.io
 spec:
   group: kuma.io
@@ -1615,7 +1615,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayroutes.kuma.io
 spec:
   group: kuma.io
@@ -1665,7 +1665,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgateways.kuma.io
 spec:
   group: kuma.io
@@ -1717,7 +1717,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
@@ -2103,7 +2103,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
@@ -2777,7 +2777,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshinsights.kuma.io
 spec:
   group: kuma.io
@@ -2827,7 +2827,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io
@@ -2877,7 +2877,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
@@ -3455,7 +3455,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
@@ -3750,7 +3750,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
@@ -3951,7 +3951,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
@@ -4119,7 +4119,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
@@ -4672,7 +4672,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
@@ -5303,7 +5303,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshretries.kuma.io
 spec:
   group: kuma.io
@@ -5814,7 +5814,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshservices.kuma.io
 spec:
   group: kuma.io
@@ -6034,7 +6034,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
@@ -6321,7 +6321,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
@@ -6747,7 +6747,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplanes.kuma.io
 spec:
   group: kuma.io
@@ -6819,7 +6819,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
@@ -7119,7 +7119,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
@@ -7405,7 +7405,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -7612,7 +7612,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: proxytemplates.kuma.io
 spec:
   group: kuma.io
@@ -7662,7 +7662,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: ratelimits.kuma.io
 spec:
   group: kuma.io
@@ -7712,7 +7712,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: retries.kuma.io
 spec:
   group: kuma.io
@@ -7762,7 +7762,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: serviceinsights.kuma.io
 spec:
   group: kuma.io
@@ -7812,7 +7812,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: timeouts.kuma.io
 spec:
   group: kuma.io
@@ -7862,7 +7862,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficlogs.kuma.io
 spec:
   group: kuma.io
@@ -7912,7 +7912,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -7962,7 +7962,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: externalservices.kuma.io
 spec:
   group: kuma.io
@@ -8012,7 +8012,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficroutes.kuma.io
 spec:
   group: kuma.io
@@ -8062,7 +8062,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: traffictraces.kuma.io
 spec:
   group: kuma.io
@@ -8112,7 +8112,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: virtualoutbounds.kuma.io
 spec:
   group: kuma.io
@@ -8162,7 +8162,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegresses.kuma.io
 spec:
   group: kuma.io
@@ -8220,7 +8220,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegressinsights.kuma.io
 spec:
   group: kuma.io
@@ -8270,7 +8270,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingresses.kuma.io
 spec:
   group: kuma.io
@@ -8328,7 +8328,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingressinsights.kuma.io
 spec:
   group: kuma.io
@@ -8379,7 +8379,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneinsights.kuma.io
 spec:
   group: kuma.io
@@ -8429,7 +8429,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zones.kuma.io
 spec:
   group: kuma.io
@@ -8479,7 +8479,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: faultinjections.kuma.io
 spec:
   group: kuma.io
@@ -8529,7 +8529,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: healthchecks.kuma.io
 spec:
   group: kuma.io
@@ -8579,7 +8579,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
@@ -8653,7 +8653,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
@@ -9371,7 +9371,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
diff --git a/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml b/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
index 66fad90c8..d532621fc 100644
--- a/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
+++ b/app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: circuitbreakers.kuma.io
 spec:
   group: kuma.io
@@ -54,7 +54,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: containerpatches.kuma.io
 spec:
   group: kuma.io
@@ -168,7 +168,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplaneinsights.kuma.io
 spec:
   group: kuma.io
@@ -218,7 +218,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: dataplanes.kuma.io
 spec:
   group: kuma.io
@@ -290,7 +290,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: externalservices.kuma.io
 spec:
   group: kuma.io
@@ -340,7 +340,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: faultinjections.kuma.io
 spec:
   group: kuma.io
@@ -390,7 +390,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: healthchecks.kuma.io
 spec:
   group: kuma.io
@@ -440,7 +440,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: hostnamegenerators.kuma.io
 spec:
   group: kuma.io
@@ -514,7 +514,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshaccesslogs.kuma.io
 spec:
   group: kuma.io
@@ -1232,7 +1232,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshcircuitbreakers.kuma.io
 spec:
   group: kuma.io
@@ -1976,7 +1976,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshes.kuma.io
 spec:
   group: kuma.io
@@ -2028,7 +2028,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshexternalservices.kuma.io
 spec:
   group: kuma.io
@@ -2363,7 +2363,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshfaultinjections.kuma.io
 spec:
   group: kuma.io
@@ -2788,7 +2788,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayconfigs.kuma.io
 spec:
   group: kuma.io
@@ -3015,7 +3015,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayinstances.kuma.io
 spec:
   group: kuma.io
@@ -3371,7 +3371,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgatewayroutes.kuma.io
 spec:
   group: kuma.io
@@ -3421,7 +3421,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshgateways.kuma.io
 spec:
   group: kuma.io
@@ -3473,7 +3473,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhealthchecks.kuma.io
 spec:
   group: kuma.io
@@ -3859,7 +3859,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshhttproutes.kuma.io
 spec:
   group: kuma.io
@@ -4533,7 +4533,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshinsights.kuma.io
 spec:
   group: kuma.io
@@ -4583,7 +4583,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshloadbalancingstrategies.kuma.io
 spec:
   group: kuma.io
@@ -5161,7 +5161,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmetrics.kuma.io
 spec:
   group: kuma.io
@@ -5456,7 +5456,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshmultizoneservices.kuma.io
 spec:
   group: kuma.io
@@ -5657,7 +5657,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshpassthroughs.kuma.io
 spec:
   group: kuma.io
@@ -5825,7 +5825,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshproxypatches.kuma.io
 spec:
   group: kuma.io
@@ -6378,7 +6378,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshratelimits.kuma.io
 spec:
   group: kuma.io
@@ -7009,7 +7009,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshretries.kuma.io
 spec:
   group: kuma.io
@@ -7520,7 +7520,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshservices.kuma.io
 spec:
   group: kuma.io
@@ -7740,7 +7740,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtcproutes.kuma.io
 spec:
   group: kuma.io
@@ -8027,7 +8027,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtimeouts.kuma.io
 spec:
   group: kuma.io
@@ -8453,7 +8453,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtlses.kuma.io
 spec:
   group: kuma.io
@@ -8753,7 +8753,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtraces.kuma.io
 spec:
   group: kuma.io
@@ -9039,7 +9039,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: meshtrafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -9246,7 +9246,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: proxytemplates.kuma.io
 spec:
   group: kuma.io
@@ -9296,7 +9296,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: ratelimits.kuma.io
 spec:
   group: kuma.io
@@ -9346,7 +9346,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: retries.kuma.io
 spec:
   group: kuma.io
@@ -9396,7 +9396,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: serviceinsights.kuma.io
 spec:
   group: kuma.io
@@ -9446,7 +9446,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: timeouts.kuma.io
 spec:
   group: kuma.io
@@ -9496,7 +9496,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficlogs.kuma.io
 spec:
   group: kuma.io
@@ -9546,7 +9546,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficpermissions.kuma.io
 spec:
   group: kuma.io
@@ -9596,7 +9596,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: trafficroutes.kuma.io
 spec:
   group: kuma.io
@@ -9646,7 +9646,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: traffictraces.kuma.io
 spec:
   group: kuma.io
@@ -9696,7 +9696,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: virtualoutbounds.kuma.io
 spec:
   group: kuma.io
@@ -9746,7 +9746,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegresses.kuma.io
 spec:
   group: kuma.io
@@ -9804,7 +9804,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneegressinsights.kuma.io
 spec:
   group: kuma.io
@@ -9854,7 +9854,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingresses.kuma.io
 spec:
   group: kuma.io
@@ -9912,7 +9912,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneingressinsights.kuma.io
 spec:
   group: kuma.io
@@ -9963,7 +9963,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zoneinsights.kuma.io
 spec:
   group: kuma.io
@@ -10013,7 +10013,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.17.1
+    controller-gen.kubebuilder.io/version: v0.17.2
   name: zones.kuma.io
 spec:
   group: kuma.io
diff --git a/test/e2e_env/universal/auth/dp_auth.go b/test/e2e_env/universal/auth/dp_auth.go
index 465024b0f..e3cb83bde 100644
--- a/test/e2e_env/universal/auth/dp_auth.go
+++ b/test/e2e_env/universal/auth/dp_auth.go
@@ -1,11 +1,6 @@
 package auth
 
 import (
-	"encoding/base64"
-	"fmt"
-	"math/rand"
-
-	"github.com/golang-jwt/jwt/v4"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -70,66 +65,4 @@ func DpAuth() {
 			return universal.Cluster.GetKumactlOptions().RunKumactlAndGetOutput("get", "dataplanes", "-oyaml")
 		}, "30s", "1s").ShouldNot(ContainSubstring("192.168.0.2"))
 	})
-
-	It("should revoke token and kick out dataplane proxy out of the mesh", func() {
-		// given
-		serviceName := "test-server-to-be-revoked"
-		token, err := universal.Cluster.GetKuma().GenerateDpToken(meshName, serviceName)
-		Expect(err).ToNot(HaveOccurred())
-
-		err = universal.Cluster.Install(TestServerUniversal(serviceName, meshName, WithServiceName(serviceName), WithToken(token)))
-		Expect(err).ToNot(HaveOccurred())
-
-		Eventually(func(g Gomega) {
-			online, found, err := IsDataplaneOnline(universal.Cluster, meshName, serviceName)
-			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(found).To(BeTrue())
-			g.Expect(online).To(BeTrue())
-		}).Should(Succeed())
-
-		// when token ID is added to revocation list
-		claims := &jwt.RegisteredClaims{}
-		_, _, err = jwt.NewParser().ParseUnverified(token, claims)
-		Expect(err).ToNot(HaveOccurred())
-
-		yaml := fmt.Sprintf(`
-type: Secret
-mesh: dp-auth
-name: dataplane-token-revocations-dp-auth
-data: %s`, base64.StdEncoding.EncodeToString([]byte(claims.ID)))
-		Expect(universal.Cluster.Install(YamlUniversal(yaml))).To(Succeed())
-
-		// then DPP is disconnected
-		Eventually(func(g Gomega) {
-			// we need to trigger XDS config change for this DP to disconnect it
-			// this limitation may be lifted in the future
-			randomRetries := rand.Int()%100 + 1 // #nosec G404 -- this is for tests no need to use secure rand
-			yaml = fmt.Sprintf(`
-type: MeshRetry
-name: retry-policy
-mesh: dp-auth
-spec:
-  targetRef:
-    kind: MeshService
-    name: test-server-to-be-revoked
-  to:
-    - targetRef:
-        kind: MeshService
-        name: test-server-to-be-revoked
-      default:
-        http:
-          numRetries: %d
-          backOff:
-            baseInterval: 15s
-            maxInterval: 20m
-          retryOn:
-            - "5xx"
-`, randomRetries)
-			g.Expect(universal.Cluster.Install(YamlUniversal(yaml))).To(Succeed())
-
-			online, _, err := IsDataplaneOnline(universal.Cluster, meshName, serviceName)
-			g.Expect(err).ToNot(HaveOccurred())
-			g.Expect(online).To(BeFalse()) // either online or not found
-		}).Should(Succeed())
-	})
 }
diff --git a/test/e2e_env/universal/gateway/cross-mesh.go b/test/e2e_env/universal/gateway/cross-mesh.go
index 762fbde07..39386dd09 100644
--- a/test/e2e_env/universal/gateway/cross-mesh.go
+++ b/test/e2e_env/universal/gateway/cross-mesh.go
@@ -48,9 +48,9 @@ func CrossMeshGatewayOnUniversal() {
 	)
 	crossMeshGatewayDataplane := mkGatewayDataplane(crossMeshGatewayName, gatewayMesh, crossMeshGatewayName)
 	edgeGatewayYaml := MkGateway(
-		edgeGatewayName, gatewayOtherMesh, crossMeshGatewayName, false, "", echoServerName(gatewayOtherMesh), edgeGatewayPort,
+		edgeGatewayName, gatewayOtherMesh, edgeGatewayName, false, "", echoServerName(gatewayOtherMesh), edgeGatewayPort,
 	)
-	edgeGatewayDataplane := mkGatewayDataplane(edgeGatewayName, gatewayOtherMesh, crossMeshGatewayName)
+	edgeGatewayDataplane := mkGatewayDataplane(edgeGatewayName, gatewayOtherMesh, edgeGatewayName)
 
 	BeforeAll(func() {
 		By("installing one cross-mesh gateway and one non-cross-mesh gateway")
diff --git a/test/e2e_env/universal/gateway/gateway.go b/test/e2e_env/universal/gateway/gateway.go
index 6286db687..efc6f4402 100644
--- a/test/e2e_env/universal/gateway/gateway.go
+++ b/test/e2e_env/universal/gateway/gateway.go
@@ -97,22 +97,26 @@ networking:
 			Expect(universal.Cluster.Install(TrafficPermissionUniversal(mesh))).To(Succeed())
 			Expect(
 				universal.Cluster.Install(YamlUniversal(fmt.Sprintf(`
-type: MeshGatewayRoute
-mesh: %s
+type: MeshHTTPRoute
 name: external-routes
-selectors:
-- match:
-    kuma.io/service: gateway-proxy
-conf:
-  http:
+mesh: %s
+spec:
+  targetRef:
+    kind: MeshGateway
+    name: gateway-proxy
+  to:
+  - targetRef:
+      kind: Mesh
     rules:
     - matches:
       - path:
-          match: PREFIX
-          value: /external
-      backends:
-      - destination:
-          kuma.io/service: external-echo
+          type: PathPrefix
+          value: "/external"
+      default:
+        backendRefs:
+        - kind: MeshService
+          name: external-echo
+          weight: 100
 `, mesh))),
 			).To(Succeed())
 		})
diff --git a/test/e2e_env/universal/gateway/utils.go b/test/e2e_env/universal/gateway/utils.go
index c614190da..026b1f836 100644
--- a/test/e2e_env/universal/gateway/utils.go
+++ b/test/e2e_env/universal/gateway/utils.go
@@ -101,23 +101,27 @@ conf:
 `, name, mesh, serviceName, port, crossMesh, hostname)
 
 	route := fmt.Sprintf(`
-type: MeshGatewayRoute
+type: MeshHTTPRoute
 name: %s
 mesh: %s
-selectors:
-- match:
-    kuma.io/service: %s
-conf:
-  http:
+spec:
+  targetRef:
+    kind: MeshGateway
+    name: %s
+  to:
+  - targetRef:
+      kind: Mesh
     rules:
     - matches:
       - path:
-          match: PREFIX
-          value: /
-      backends:
-      - destination:
-          kuma.io/service: %s
-`, name, mesh, serviceName, backendService)
+          type: PathPrefix
+          value: "/"
+      default:
+        backendRefs:
+        - kind: MeshService
+          name: %s
+          weight: 100
+`, name, mesh, name, backendService)
 
 	return strings.Join([]string{meshGateway, route}, "\n---\n")
 }
diff --git a/test/e2e_env/universal/observability/meshtrace.go b/test/e2e_env/universal/observability/meshtrace.go
index 1c5aa85fc..7276a29ee 100644
--- a/test/e2e_env/universal/observability/meshtrace.go
+++ b/test/e2e_env/universal/observability/meshtrace.go
@@ -50,8 +50,8 @@ func PluginTest() {
 			Install(MeshUniversal(mesh)).
 			Install(TestServerUniversal("test-server", mesh, WithArgs([]string{"echo", "--instance", "universal1"}))).
 			Install(DemoClientUniversal(AppModeDemoClient, mesh, WithTransparentProxy(true))).
-			Install(GatewayProxyUniversal(mesh, "edge-gateway")).
-			Install(YamlUniversal(gateway.MkGateway("edge-gateway", mesh, "edge-gateway", false, "example.kuma.io", "test-server", 8080))).
+			Install(GatewayProxyUniversal(mesh, "trace-edge-gateway")).
+			Install(YamlUniversal(gateway.MkGateway("trace-edge-gateway", mesh, "trace-edge-gateway", false, "example.kuma.io", "test-server", 8080))).
 			Install(gateway.GatewayClientAppUniversal("gateway-client")).
 			Setup(universal.Cluster)
 		obsClient = obs.From(obsDeployment, universal.Cluster)
@@ -97,9 +97,9 @@ func PluginTest() {
 
 		Eventually(func(g Gomega) {
 			gateway.ProxySimpleRequests(universal.Cluster, "universal1",
-				GatewayAddressPort("edge-gateway", 8080), "example.kuma.io")(g)
+				GatewayAddressPort("trace-edge-gateway", 8080), "example.kuma.io")(g)
 			g.Expect(obsClient.TracedServices()).Should(ContainElements([]string{
-				"edge-gateway",
+				"trace-edge-gateway",
 				"jaeger-query",
 				"test-server",
 			}))