Skip to content

fix(ovn): update patches for compatibility with upstream OVN branch-25.03#6331

Merged
oilbeater merged 1 commit intomasterfrom
fix-patches
Feb 24, 2026
Merged

fix(ovn): update patches for compatibility with upstream OVN branch-25.03#6331
oilbeater merged 1 commit intomasterfrom
fix-patches

Conversation

@oilbeater
Copy link
Copy Markdown
Collaborator

Summary

  • Update three OVN patches to be compatible with recent upstream changes in branch-25.03 that introduced the bool acl_ct_translation parameter across lflow management functions
  • 78cade01: add kube_ovn_hint parameter alongside new upstream acl_ct_translation in all lflow-mgr function signatures and macros
  • e7d3ba53: adjust insertion point for node-local DNS conntrack skip after new if (!acl_ct_translation) block in build_ls_stateful_rec_pre_acls()
  • e889d469: update line offsets and index hashes for upstream code changes

Test plan

  • All 17 OVN patches apply cleanly in order against current branch-25.03 HEAD (f8c8b837)
  • Docker base image builds successfully with updated patches
  • E2E tests pass with the rebuilt image

🤖 Generated with Claude Code

…5.03

Update three OVN patches to be compatible with recent upstream changes
in branch-25.03 that introduced the `bool acl_ct_translation` parameter
across lflow management functions.

- 78cade01: add kube_ovn_hint parameter alongside acl_ct_translation
- e7d3ba53: adjust insertion point after new if (!acl_ct_translation) block
- e889d469: update line offsets for upstream code changes

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@dosubot dosubot bot added size:L This PR changes 100-499 lines, ignoring generated files. bug Something isn't working labels Feb 24, 2026
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @oilbeater, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request updates existing OVN patches to maintain compatibility with recent changes in the upstream OVN branch-25.03. The primary motivation is to adapt to the introduction of a bool acl_ct_translation parameter across various logical flow management functions, which required modifications to function signatures, macro definitions, and code insertion points. These adjustments ensure that the custom OVN patches can apply cleanly and function correctly with the updated upstream codebase.

Highlights

  • Patch 78cade01 Updated: Modified lflow management functions and macros to incorporate acl_ct_translation and kube_ovn_hint parameters, ensuring compatibility with new upstream OVN function signatures.
  • Patch e7d3ba53 Updated: Relocated the code block responsible for skipping conntrack for node-local DNS IP within build_ls_stateful_rec_pre_acls() in northd/northd.c to align with upstream changes.
  • Patch e889d469 Updated: Adjusted line offsets and index hashes in northd/en-global-config.c and northd/northd.c to reflect upstream code modifications, and added new boolean options for acl_ct_translation and bcast_arp_req_flood.
Changelog
  • dist/images/patches/78cade01874292e2c101c39b975290ef6c812a50.patch
    • Updated file change statistics to reflect 82 insertions and 15 deletions.
    • Modified controller/lflow.c to include lib/ovn-util.h.
    • Adjusted function signatures and macro definitions in northd/lflow-mgr.c and northd/lflow-mgr.h to add bool acl_ct_translation and const char *kube_ovn_hint parameters.
    • Updated line offsets in controller/ovn-controller.c and controller/ovn-controller.h.
  • dist/images/patches/e7d3ba53cdcbc524bb29c54ddb07b83cc4258ed7.patch
    • Updated file change statistics.
    • Adjusted the insertion point for the node-local DNS conntrack skip logic within build_ls_stateful_rec_pre_acls() in northd/northd.c.
  • dist/images/patches/e889d46924085ca0fe38a2847da973dfe6ea100e.patch
    • Removed commit header information from the patch file.
    • Updated index hashes and line offsets in northd/en-global-config.c and northd/northd.c.
    • Added acl_ct_translation and bcast_arp_req_flood boolean options to ovnnb_db_run in northd/northd.c.
Activity
  • The author, oilbeater, created this pull request to update OVN patches.
  • The author has outlined a test plan, confirming that all 17 OVN patches apply cleanly against branch-25.03 HEAD.
  • Further testing is planned for Docker base image builds and E2E tests with the rebuilt image.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@coveralls
Copy link
Copy Markdown

Pull Request Test Coverage Report for Build 22360495409

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 23.055%

Totals Coverage Status
Change from base Build 22338892784: 0.0%
Covered Lines: 12524
Relevant Lines: 54323

💛 - Coveralls

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

The pull request updates three OVN patches to ensure compatibility with recent upstream changes in branch-25.03. The primary changes involve introducing the bool acl_ct_translation parameter and a kube_ovn_hint parameter across various lflow management functions and macros. This includes modifications to function signatures, struct members, and macro definitions in lflow-mgr.c and lflow-mgr.h. Additionally, the patch adjusts the insertion point for node-local DNS conntrack skip logic in build_ls_stateful_rec_pre_acls() within northd.c and updates line offsets and index hashes to align with upstream code changes. The changes appear to be well-aligned with the stated goal of maintaining compatibility and introducing new functionality as described.

@oilbeater oilbeater merged commit 820341d into master Feb 24, 2026
71 of 76 checks passed
@oilbeater oilbeater deleted the fix-patches branch February 24, 2026 17:02
oilbeater added a commit that referenced this pull request Feb 25, 2026
…5.03 (#6331)

Update three OVN patches to be compatible with recent upstream changes
in branch-25.03 that introduced the `bool acl_ct_translation` parameter
across lflow management functions.

- 78cade01: add kube_ovn_hint parameter alongside acl_ct_translation
- e7d3ba53: adjust insertion point after new if (!acl_ct_translation) block
- e889d469: update line offsets for upstream code changes

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
(cherry picked from commit 820341d)
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:L This PR changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants