Skip to content

backport: cherry-pick critical bugfixes to release-1.15#6555

Merged
oilbeater merged 9 commits intorelease-1.15from
backport-critical-fixes-1.15
Mar 31, 2026
Merged

backport: cherry-pick critical bugfixes to release-1.15#6555
oilbeater merged 9 commits intorelease-1.15from
backport-critical-fixes-1.15

Conversation

@oilbeater
Copy link
Copy Markdown
Collaborator

Summary

Backport 8 critical bugfixes from master to release-1.15:

Skipped (not applicable to 1.15)

Adaptation notes

  • #6363: replaced ovs.OvnDatabaseControl() (master-only API) with direct exec.Command("ovn-appctl", ...) call
  • #6538: manually updated GwIPtableCountersGwIPTablesCounters rename across daemon package

Test plan

  • make build-go — compilation passes
  • make lint — no new lint issues (pre-existing gosec G703 on cniserver.go unchanged)
  • go test ./pkg/controller/... — passes
  • go test ./pkg/daemon/... — passes
  • go test ./pkg/ovs/... — passes
  • go test ./pkg/util/... — passes
  • E2E tests in CI

🤖 Generated with Claude Code

@dosubot dosubot bot added size:XL This PR changes 500-999 lines, ignoring generated files. bug Something isn't working labels Mar 31, 2026
@coveralls
Copy link
Copy Markdown

coveralls commented Mar 31, 2026

Pull Request Test Coverage Report for Build 23779251406

Details

  • 35 of 134 (26.12%) changed or added relevant lines in 10 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.1%) to 23.488%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/controller/vpc_nat_gw_eip.go 0 1 0.0%
pkg/controller/ovn_eip.go 0 2 0.0%
pkg/informer/kubevirt.go 0 2 0.0%
pkg/daemon/controller_linux.go 7 10 70.0%
pkg/controller/admin_network_policy.go 0 5 0.0%
pkg/ovs/ovn-nb-acl.go 28 36 77.78%
pkg/controller/cluster_network_policy.go 0 12 0.0%
pkg/controller/subnet.go 0 13 0.0%
pkg/daemon/gateway_linux.go 0 16 0.0%
pkg/ovn_leader_checker/ovn.go 0 37 0.0%
Totals Coverage Status
Change from base Build 23776815408: 0.1%
Covered Lines: 12791
Relevant Lines: 54458

💛 - Coveralls

…lient-go panic (#6537)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
…ndler (#6515)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
…6547)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
…PBlock except CIDRs (#6536)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
…g protocol IP (#6522)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
…luster membership (#6363)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
…6538)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
Use exec.Command directly instead of ovs.OvnDatabaseControl which
does not exist on this branch.

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
@oilbeater oilbeater force-pushed the backport-critical-fixes-1.15 branch from 79315c2 to 06cde90 Compare March 31, 2026 03:37
@oilbeater oilbeater merged commit 8ff5589 into release-1.15 Mar 31, 2026
143 of 146 checks passed
@oilbeater oilbeater deleted the backport-critical-fixes-1.15 branch March 31, 2026 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working size:XL This PR changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants