This PR is auto-generated from #4385 to be assessed for backporting due to the inclusion of the label backport/1.5.x.
:rotating_light:
Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.
The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.
Backport
This PR is auto-generated from #4385 to be assessed for backporting due to the inclusion of the label backport/1.5.x.
:rotating_light:
The person who merged in the original PR is: @zalimeni This person should manually cherry-pick the original PR into a new backport PR, and close this one when the manual backport PR is merged in.
The below text is copied from the body of the original PR.
Changes proposed in this PR
Supports changes in https://github.com/hashicorp/consul/pull/21816 with CRD updates:
How I've tested this PR
kind
and validated both changes are reflected in xDS / config when created as CRDsHow I expect reviewers to test this PR
👀 + spot check me on the CRD update process in case I missed a step. It's been a while since I've done one of these.
Checklist
Overview of commits
- 2d3d34e5548ad6f6ee3e7c502bcab6af271ae152