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(kuma-cp): handle external services with permissive mtls (backport of #7179) #7188

Merged
merged 2 commits into from
Jul 7, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Jul 6, 2023

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

Generated by action

cherry-picked commit 6e228b7
⚠️ ⚠️ ⚠️ 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 6e228b7e5.
  (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:
	new file:   test/e2e_env/kubernetes/externalservices/permissive_mtls.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/xds/context/mesh_context_builder.go
	both modified:   test/e2e_env/kubernetes/kubernetes_suite_test.go

@jakubdyszkiewicz jakubdyszkiewicz force-pushed the chore/backport-release-2.1-7179 branch 3 times, most recently from 5883fef to da83fb0 Compare July 7, 2023 09:49
Signed-off-by: Jakub Dyszkiewicz <[email protected]>
@jakubdyszkiewicz jakubdyszkiewicz force-pushed the chore/backport-release-2.1-7179 branch from da83fb0 to 4ae357c Compare July 7, 2023 10:12
@jakubdyszkiewicz jakubdyszkiewicz enabled auto-merge (squash) July 7, 2023 10:13
@jakubdyszkiewicz jakubdyszkiewicz merged commit 6c11867 into release-2.1 Jul 7, 2023
@jakubdyszkiewicz jakubdyszkiewicz deleted the chore/backport-release-2.1-7179 branch July 7, 2023 10:33
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.

1 participant