Skip to content

[release-1.15] fix(ipam): preserve IP pool allocation state - #7114

Merged
zhangzujian merged 4 commits into
kubeovn:release-1.15from
zhangzujian:backport-7107-release-1.15
Aug 3, 2026
Merged

[release-1.15] fix(ipam): preserve IP pool allocation state#7114
zhangzujian merged 4 commits into
kubeovn:release-1.15from
zhangzujian:backport-7107-release-1.15

Conversation

@zhangzujian

@zhangzujian zhangzujian commented Aug 3, 2026

Copy link
Copy Markdown
Member

Summary

  • Backport the IPPool allocation-state fixes and package-level regression tests from fix(ipam): preserve IP pool allocation state #7107.
  • Preserve named pool ownership across subnet reconciliation and return removed pool ranges to the default pool.
  • Adapt the regression tests to the legacy GetRandomAddress API used by this maintenance branch.
  • Exclude the master-only e2e changes intentionally because this branch does not contain test/e2e/kube-ovn/ipam/ipam.go.

Test Plan

  • go test -p=1 -count=50 ./pkg/ipam
  • go vet ./pkg/ipam
  • golangci-lint run --concurrency=2 ./pkg/ipam
  • git diff --check origin/release-1.15...HEAD

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
(cherry picked from commit a0924b9)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
(cherry picked from commit 222c3aa)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
(cherry picked from commit 7ca82dd)
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
@dosubot dosubot Bot added size:S This PR changes 10-29 lines, ignoring generated files. bug Something isn't working go Pull requests that update Go code test automation tests labels Aug 3, 2026
@zhangzujian
zhangzujian merged commit a9cd30f into kubeovn:release-1.15 Aug 3, 2026
72 of 73 checks passed
@zhangzujian
zhangzujian deleted the backport-7107-release-1.15 branch August 3, 2026 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working go Pull requests that update Go code size:S This PR changes 10-29 lines, ignoring generated files. test automation tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant