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(kds): fix the case when webhook/db reject resource (backport of #10315) #10352

Merged
merged 2 commits into from
May 31, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented May 29, 2024

Automatic cherry-pick of #10315 for branch release-2.5

Generated by action

cherry-picked commit cd189ee
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit cd189ee75.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/kds/v2/server/resource_retry_forcer.go

no changes added to commit (use "git add" and/or "git commit -a")

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@kumahq kumahq bot requested a review from a team as a code owner May 29, 2024 14:30
@kumahq kumahq bot requested review from slonka, lobkovilya and lukidzi and removed request for a team May 29, 2024 14:30
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@lukidzi lukidzi merged commit ebf2d40 into release-2.5 May 31, 2024
5 checks passed
@lukidzi lukidzi deleted the chore/backport-release-2.5-10315 branch May 31, 2024 10:23
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