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

tests(clustering): sync v1 should work with or without privileged agent #13866

Merged
merged 13 commits into from
Nov 15, 2024

Conversation

chronolaw
Copy link
Contributor

@chronolaw chronolaw commented Nov 13, 2024

Summary

Refactored some code in #13857

KAG-5807
KAG-5811

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 #[issue number]

@github-actions github-actions bot added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Nov 13, 2024
@pull-request-size pull-request-size bot added size/L and removed size/M labels Nov 13, 2024
@chronolaw chronolaw marked this pull request as ready for review November 13, 2024 08:45
@ADD-SP ADD-SP merged commit da1100d into master Nov 15, 2024
26 checks passed
@ADD-SP ADD-SP deleted the tests/clustering_privileged_agent branch November 15, 2024 03:51
@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-13866-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13866-to-master-to-upstream
git checkout -b cherry-pick-13866-to-master-to-upstream
ancref=$(git merge-base f494c53f8b0d8c9991c8c99294251feb5e164e45 e0cd1b361586e852d19c9dad631ba8e78e0f9122)
git cherry-pick -x $ancref..e0cd1b361586e852d19c9dad631ba8e78e0f9122

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

Wait for #13857 cherry-pick successfully.

@chronolaw chronolaw removed the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Nov 18, 2024
@chronolaw chronolaw added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Nov 18, 2024
@team-gateway-bot
Copy link
Collaborator

Successfully created cherry-pick PR for master:

@chronolaw chronolaw removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Nov 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee size/L skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants