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) #8174

Closed
wants to merge 4 commits into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 30, 2023

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

Generated by action

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

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

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

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

Signed-off-by: Jakub Dyszkiewicz <[email protected]>
Signed-off-by: Jakub Dyszkiewicz <[email protected]>
Signed-off-by: Jakub Dyszkiewicz <[email protected]>
@jakubdyszkiewicz jakubdyszkiewicz enabled auto-merge (squash) October 30, 2023 12:11
@jakubdyszkiewicz
Copy link
Contributor

the test is flaky. It's not clear for me why

@slonka
Copy link
Contributor

slonka commented Nov 24, 2023

@jakubdyszkiewicz looks like this does not work for this release, can you look into this?

@slonka slonka removed the conflict label Nov 24, 2023
@jakubdyszkiewicz
Copy link
Contributor

Closing for now as nobody ever asked about this in 2.1 and it seems to take a significant amount of work to make this work. If needed, we can reopen, work on it and release new patch of 2.1

auto-merge was automatically disabled December 5, 2023 09:53

Pull request was closed

@lahabana lahabana deleted the chore/backport-release-2.1-8171 branch December 17, 2023 19:37
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.

2 participants