Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of [NET-11043] crd: support request normalization and header match options to prevent L7 intentions bypass into release/1.4.x #4396

Conversation

hc-github-team-consul-core

Backport

This PR is auto-generated from #4385 to be assessed for backporting due to the inclusion of the label backport/1.4.x.

🚨

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.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Changes proposed in this PR

Supports changes in hashicorp/consul#21816 with CRD updates:

How I've tested this PR

  • Added unit tests
  • Manually spun up cluster in kind and validated both changes are reflected in xDS / config when created as CRDs

How 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

Copy link

hashicorp-cla-app bot commented Oct 17, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-11043-l7-intentions-updates-support/correctly-prompt-gazelle branch from 580410f to 5840c17 Compare October 17, 2024 22:59
@zalimeni zalimeni marked this pull request as ready for review October 17, 2024 23:01
@zalimeni zalimeni enabled auto-merge (squash) October 17, 2024 23:01
@zalimeni zalimeni merged commit 48090ca into release/1.4.x Oct 18, 2024
49 of 51 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/net-11043-l7-intentions-updates-support/correctly-prompt-gazelle branch October 18, 2024 01:18
@zalimeni zalimeni restored the backport/zalimeni/net-11043-l7-intentions-updates-support/correctly-prompt-gazelle branch October 18, 2024 01:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants