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(clustering): CP should support both v1 and v2 #13805

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Conversation

StarlightIbuki
Copy link
Contributor

@StarlightIbuki StarlightIbuki commented Oct 29, 2024

Summary

Let's fix the rest of the tests in another PR.

Checklist

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

Issue reference

Fix KAG-5551

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Oct 29, 2024
@team-gateway-bot team-gateway-bot added the author/community PRs from the open-source community (not Kong Inc) label Oct 29, 2024
@chronolaw chronolaw marked this pull request as draft October 30, 2024 06:52
@StarlightIbuki StarlightIbuki changed the title fix(clustering): avoid 500 accessing v1 api when inc_sync enabled fix(clustering): CP should support v1 Oct 30, 2024
@StarlightIbuki StarlightIbuki marked this pull request as ready for review October 30, 2024 07:24
kong/init.lua Outdated Show resolved Hide resolved
kong/init.lua Outdated Show resolved Hide resolved
@StarlightIbuki StarlightIbuki force-pushed the fix/rpc-v1-500 branch 5 times, most recently from 6fb6360 to ad5a0c5 Compare October 31, 2024 07:24
@pull-request-size pull-request-size bot added size/M and removed size/S labels Oct 31, 2024
@StarlightIbuki StarlightIbuki force-pushed the fix/rpc-v1-500 branch 3 times, most recently from 1d10000 to 9a27cab Compare October 31, 2024 07:33
kong/init.lua Outdated Show resolved Hide resolved
@StarlightIbuki StarlightIbuki changed the base branch from master to refactor/tuning_inc_sync October 31, 2024 09:46
@pull-request-size pull-request-size bot added size/M and removed size/L labels Oct 31, 2024
Base automatically changed from refactor/tuning_inc_sync to master November 1, 2024 09:12
@pull-request-size pull-request-size bot added size/L and removed size/M labels Nov 1, 2024
@chronolaw chronolaw changed the title fix(clustering): CP should support v1 fix(clustering): CP should support both v1 and v2 Nov 4, 2024
@team-eng-enablement team-eng-enablement removed the author/community PRs from the open-source community (not Kong Inc) label Nov 4, 2024
@ADD-SP ADD-SP merged commit 6cb8235 into master Nov 5, 2024
39 checks passed
@ADD-SP ADD-SP deleted the fix/rpc-v1-500 branch November 5, 2024 02:44
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13805-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13805-to-master-to-upstream
git checkout -b cherry-pick-13805-to-master-to-upstream
ancref=$(git merge-base 0072d7b770af30d6f3373ed6e6d39955b1c78090 5791783c811a692233957866b0753dd8d088378a)
git cherry-pick -x $ancref..5791783c811a692233957866b0753dd8d088378a

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 5, 2024
@StarlightIbuki
Copy link
Contributor Author

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13805-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13805-to-master-to-upstream
git checkout -b cherry-pick-13805-to-master-to-upstream
ancref=$(git merge-base 0072d7b770af30d6f3373ed6e6d39955b1c78090 5791783c811a692233957866b0753dd8d088378a)
git cherry-pick -x $ancref..5791783c811a692233957866b0753dd8d088378a

We will cherry-pick after a larger cherry-pick is done: https://github.com/Kong/kong-ee/pull/10460

@kikito kikito removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 12, 2024
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.

7 participants