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

fix(MeshTrafficPermission): support permissive mtls (backport of #8171) #8178

Merged
merged 2 commits into from Oct 30, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 30, 2023

Automatic cherry-pick of #8171 for branch release-2.2

Generated by action

cherry-picked commit 0e0489f
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.2
Your branch is up to date with 'origin/release-2.2'.

You are currently cherry-picking commit 0e0489feb.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/plugins/policies/meshtrafficpermission/plugin/v1alpha1/plugin.go
	modified:   pkg/plugins/policies/meshtrafficpermission/plugin/v1alpha1/testdata/apply.golden.yaml
	modified:   pkg/test/resources/builders/mesh_builder.go
	modified:   pkg/xds/generator/inbound_proxy_generator.go
	modified:   pkg/xds/generator/testdata/inbound-proxy/5-envoy-config.golden.yaml
	modified:   pkg/xds/generator/testdata/inbound-proxy/6-envoy-config.golden.yaml
	modified:   test/e2e_env/universal/meshtrafficpermission/meshtrafficpermission.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/plugins/policies/meshtrafficpermission/plugin/v1alpha1/plugin_test.go

Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
@jakubdyszkiewicz jakubdyszkiewicz merged commit bad24d6 into release-2.2 Oct 30, 2023
3 checks passed
@jakubdyszkiewicz jakubdyszkiewicz deleted the chore/backport-release-2.2-8171 branch October 30, 2023 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant