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.

Sign up for GitHub

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

Jump to bottom

chore: remove kong.tls.plugin code to reduce ce and ee conflict #14224

Merged
merged 2 commits into from
Jan 24, 2025
Merged

chore: remove kong.tls.plugin code to reduce ce and ee conflict #14224

merged 2 commits into from
Jan 24, 2025

Conversation

oowl
Copy link
Member

@oowl oowl commented Jan 24, 2025 •
edited
Loading

Summary

  1. chore: remove kong.tls.plugin code to reduce ce and ee conflict that introduced in feat: disable HTTP/2 ALPN handshake for connections on routes configured with AI-proxy. #13735
  2. chore: backport ee next upstream retry runloop change to ce https://github.com/Kong/kong-ee/pull/11102

Let's use rebase and merge button to merge it.

Checklist

  • The Pull Request has tests (no need)
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md (no need)
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

AG-186

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Jan 24, 2025
@oowl oowl force-pushed the backport-ee-feature branch from 231591b to 0294d7b Compare January 24, 2025 09:04
@fffonion fffonion merged commit 35a1052 into master Jan 24, 2025
41 of 42 checks passed
@fffonion fffonion deleted the backport-ee-feature branch January 24, 2025 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ms2008 ms2008 ms2008 approved these changes

@fffonion fffonion fffonion approved these changes

Assignees

@oowl oowl

Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/clustering core/proxy core/templates size/L skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@oowl @fffonion @ms2008