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) resync IPAM in case of Kuma CP restart (bp #1213) #1227

Merged
merged 3 commits into from
Dec 1, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 27, 2020

This is an automated backport of pull request #1213 done by Mergify

Cherry-pick of 7d745d5 has failed:

On branch mergify/bp/release-1.0/pr-1213
Your branch is up to date with 'origin/release-1.0'.

You are currently cherry-picking commit 7d745d5c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   pkg/dns/ip.go
	modified:   pkg/dns/vips/persistence.go
	modified:   pkg/dns/vips/persistence_test.go
	modified:   pkg/dns/vips_allocator_test.go
	modified:   pkg/dns/vips_synchronizer.go
	modified:   pkg/plugins/runtime/k8s/plugin.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   pkg/dns/vips_allocator.go

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 7d745d5)

# Conflicts:
#	pkg/dns/vips_allocator.go
@mergify mergify bot requested a review from a team as a code owner November 27, 2020 14:09
@mergify mergify bot added the conflicts label Nov 27, 2020
@lobkovilya lobkovilya force-pushed the mergify/bp/release-1.0/pr-1213 branch from 98368d8 to a66b284 Compare November 30, 2020 12:31
@nickolaev nickolaev merged commit fd699d8 into release-1.0 Dec 1, 2020
@nickolaev nickolaev deleted the mergify/bp/release-1.0/pr-1213 branch December 1, 2020 07:53
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.

2 participants