[release-4.22] OCPBUGS-119956: Allow per-node OVN encap IP override via env-overrides by SchSeba · Pull Request #3148 · openshift/cluster-network-operator

SchSeba · 2026-09-03T10:58:28Z

Teach the ovnkube node startup wrapper to source OVN_ENCAP_IP from the
per-node env-overrides ConfigMap and pass it to ovnkube as --encap-ip.
Normalize whitespace in the override so single-IP and comma-separated
encap IP values are passed safely as one shell argument, and keep
coverage for the optional env-overrides mount used for day2 updates.

Manual cherry-pick because #3147 failed.
Had to drop DpuNodeLeaseRenewInterval and DpuNodeLeaseDuration from the
env-overrides DaemonSet test, bootstrap fields do not exist on
the release-4.22 OVNConfigBoostrapResult API.

openshift-merge-bot · 2026-09-03T10:58:31Z

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

coderabbitai · 2026-09-03T10:58:34Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 94ff5fa1-5f20-4252-90de-f0aaed3be27d

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

_{Comment @coderabbitai help to get the list of available commands.}

SchSeba · 2026-09-03T11:03:10Z

/retitle [release-4.22] OCPBUGS-119956: Allow per-node OVN encap IP override via env-overrides- #3148

openshift-ci-robot · 2026-09-03T11:03:19Z

@SchSeba: This pull request references Jira Issue OCPBUGS-119956, which is invalid:

expected dependent Jira Issue OCPBUGS-115900 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is New instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Teach the ovnkube node startup wrapper to source OVN_ENCAP_IP from the per-node env-overrides ConfigMap and pass it to ovnkube as --encap-ip. Normalize whitespace in the override so single-IP and comma-separated encap IP values are passed safely as one shell argument, and keep coverage for the optional env-overrides mount used for day2 updates.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

SchSeba · 2026-09-03T11:05:51Z

the security failing is not related to my changes..

SchSeba · 2026-09-07T09:30:16Z

/jira refresh

openshift-ci-robot · 2026-09-07T09:30:23Z

@SchSeba: This pull request references Jira Issue OCPBUGS-119956, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-115900 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-115900 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (core-networking-bot@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

SchSeba · 2026-09-08T07:49:59Z

/retitle [release-4.22] OCPBUGS-119956: Allow per-node OVN encap IP override via env-overrides

Teach the ovnkube node startup wrapper to source OVN_ENCAP_IP from the per-node env-overrides ConfigMap and pass it to ovnkube as --encap-ip. Normalize whitespace in the override so single-IP and comma-separated encap IP values are passed safely as one shell argument, and keep coverage for the optional env-overrides mount used for day2 updates. Drop DpuNodeLeaseRenewInterval and DpuNodeLeaseDuration from the env-overrides DaemonSet test; those bootstrap fields do not exist on the release-4.22 OVNConfigBoostrapResult API. (cherry picked from commit 0ac3f7e) Signed-off-by: Sebastian Sch <sebassch@gmail.com>

tssurya · 2026-09-08T08:13:16Z

waiting on https://redhat-internal.slack.com/archives/CDCP2LA9L/p1788854122124259?thread_ts=1778514163.567789&cid=CDCP2LA9L and https://redhat-internal.slack.com/archives/CDCP2LA9L/p1788854142187619?thread_ts=1778514163.567789&cid=CDCP2LA9L

all information on a specific PR's backport should be on the PR, (eg any conflicts? why wasn't cherry-pick bot used, any new code changes etc, and mostly importantly use -x to cherry-pick from merged commit on newer branches) -same ask goes for 4.21 and 4.20 PRs and all backport PRs really

openshift-ci-robot · 2026-09-08T08:14:53Z

@SchSeba: This pull request references Jira Issue OCPBUGS-119956, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-115900 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-115900 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (core-networking-bot@redhat.com), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Teach the ovnkube node startup wrapper to source OVN_ENCAP_IP from the
per-node env-overrides ConfigMap and pass it to ovnkube as --encap-ip.
Normalize whitespace in the override so single-IP and comma-separated
encap IP values are passed safely as one shell argument, and keep
coverage for the optional env-overrides mount used for day2 updates.

Manual cherry-pick because #3147 failed.
Had to drop DpuNodeLeaseRenewInterval and DpuNodeLeaseDuration from the
env-overrides DaemonSet test, bootstrap fields do not exist on
the release-4.22 OVNConfigBoostrapResult API.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

tssurya · 2026-09-08T08:14:54Z

QA for this bug and the bugs on newer release can't be the bot - please change it to an engineer from Telco side who did the +1 reviews for you

tssurya

/lgtm

openshift-merge-bot · 2026-09-08T08:18:34Z

Scheduling required tests:
/test e2e-aws-ovn-upgrade-ipsec

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test 4.22-upgrade-from-stable-4.21-e2e-aws-ovn-upgrade
/test 4.22-upgrade-from-stable-4.21-e2e-azure-ovn-upgrade
/test 4.22-upgrade-from-stable-4.21-e2e-gcp-ovn-upgrade
/test e2e-aws-ovn-fdp-qe
/test e2e-aws-ovn-hypershift-conformance
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-aws-ovn-upgrade
/test e2e-aws-ovn-windows
/test e2e-azure-ovn-upgrade
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-dualstack-bgp
/test e2e-metal-ipi-ovn-dualstack-bgp-local-gw
/test e2e-metal-ipi-ovn-ipv6
/test e2e-metal-ipi-ovn-ipv6-ipsec
/test e2e-ovn-ipsec-step-registry
/test hypershift-e2e-aks

openshift-ci · 2026-09-08T08:18:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SchSeba, tssurya

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [tssurya]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

tssurya · 2026-09-08T08:19:13Z

will add risk assessed post CI results

SchSeba · 2026-09-09T09:56:29Z

/retest

SchSeba · 2026-09-09T13:09:53Z

/retest

SchSeba · 2026-09-10T08:59:53Z

/retest

SchSeba · 2026-09-10T16:38:11Z

/retest

tssurya · 2026-09-14T08:43:32Z

/label backport-risk-assessed

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-network-operator/3148/pull-ci-openshift-cluster-network-operator-release-4.22-e2e-metal-ipi-ovn-secondary-encap/2097236820977782784

SchSeba · 2026-09-14T11:36:03Z

/retest

danwinship · 2026-09-14T15:51:24Z

@SchSeba needs someone to confirm the fix and set /verified

SchSeba · 2026-09-14T18:18:31Z

Hi @danwinship, thanks for the comment! we have a lane to confirm it's working as checked by @tssurya already in #3148 (comment) so I think we can mark it as verified by ci no?

SchSeba · 2026-09-14T18:18:34Z

/retest

tssurya · 2026-09-14T20:30:46Z

@SchSeba : yea that's why the bug has QA assignee who sets the label once all required verifications are done they should add the verified on the PRs

SchSeba · 2026-09-15T09:56:40Z

/retest

SchSeba · 2026-09-15T09:57:09Z

@elhadjici can you please add the label for the QE here?

elhadjici · 2026-09-15T10:37:19Z

/verified by @elhadjici

openshift-ci-robot · 2026-09-15T10:37:31Z

@elhadjici: This PR has been marked as verified by @elhadjici.

Details

In response to this:

/verified by @elhadjici

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

openshift-merge-bot · 2026-09-15T16:34:53Z

/retest-required

Remaining retests: 0 against base HEAD fe422f7 and 2 for PR HEAD 773e6e3 in total

SchSeba · 2026-09-15T19:51:12Z

/retest

openshift-merge-bot · 2026-09-15T23:56:55Z

/retest-required

Remaining retests: 0 against base HEAD 6d4ef08 and 1 for PR HEAD 773e6e3 in total

SchSeba · 2026-09-16T07:29:42Z

/retest

SchSeba · 2026-09-16T13:02:47Z

/retest

SchSeba · 2026-09-16T13:03:44Z

Hi @tssurya @danwinship will it be possible to override the e2e-gcp-ovn one it's failing on un related stuff about this change and it feels a bit of waste of resources continue the /retest

tssurya · 2026-09-16T13:27:02Z

/verified by @elhadjici

please add details around how you verified this when you add the label for others to know

tssurya · 2026-09-16T13:28:10Z

Hi @tssurya @danwinship will it be possible to override the e2e-gcp-ovn one it's failing on un related stuff about this change and it feels a bit of waste of resources continue the /retest

the rule for override is simple - find the TRT bug or general bug for the test failing in the gcp lane and link it here and I can override it.
clearly it has to be something failing all over across PRs - so there must be a bug logged already against the team whose tests are failing - so use sippy or other component readiness dashboard tools to get the OCPBUGS link to find the relevant bug and drop a comment that analyses the CI failure along with the bug

openshift-ci · 2026-09-16T17:01:37Z

@SchSeba: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/security	`773e6e3`	link	false	`/test security`
ci/prow/e2e-gcp-ovn	`773e6e3`	link	true	`/test e2e-gcp-ovn`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

elhadjici · 2026-09-17T16:18:11Z

/verified by @elhadjici

please add details around how you verified this when you add the label for others to know

Ok thanks for the feedback.

After applying the changes, to verify, run the command below on any node and verify that the IP addresses are updated to match the new ones defined in the ConfigMap.
sudo ovs-vsctl show

openshift-ci Bot requested review from danwinship and martinkennelly September 3, 2026 11:00

SchSeba mentioned this pull request Sep 3, 2026

[release-4.22] OCPBUGS-119956: CNF-26697: CORENET-7330: Allow per-node OVN encap IP override via env-overrides #3147

Closed

openshift-ci Bot changed the title ~~Allow per-node OVN encap IP override via env-overrides~~ [release-4.22] OCPBUGS-119956: Allow per-node OVN encap IP override via env-overrides- #3148 Sep 3, 2026

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 3, 2026

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 3, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 7, 2026

openshift-ci Bot changed the title ~~[release-4.22] OCPBUGS-119956: Allow per-node OVN encap IP override via env-overrides- #3148~~ [release-4.22] OCPBUGS-119956: Allow per-node OVN encap IP override via env-overrides Sep 8, 2026

SchSeba force-pushed the encap-ip-from-file-and-env-4.22 branch from d6037d0 to 773e6e3 Compare September 8, 2026 08:13

tssurya approved these changes Sep 8, 2026

View reviewed changes

openshift-ci Bot assigned tssurya Sep 8, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 8, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2026

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 14, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Sep 15, 2026

Conversation

SchSeba commented Sep 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-merge-bot Bot commented Sep 3, 2026

Uh oh!

coderabbitai Bot commented Sep 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

SchSeba commented Sep 3, 2026

Uh oh!

openshift-ci-robot commented Sep 3, 2026

Uh oh!

SchSeba commented Sep 3, 2026

Uh oh!

SchSeba commented Sep 7, 2026

Uh oh!

openshift-ci-robot commented Sep 7, 2026

Uh oh!

SchSeba commented Sep 8, 2026

Uh oh!

tssurya commented Sep 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Sep 8, 2026

Uh oh!

tssurya commented Sep 8, 2026

Uh oh!

tssurya left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-merge-bot Bot commented Sep 8, 2026

Uh oh!

openshift-ci Bot commented Sep 8, 2026

Uh oh!

tssurya commented Sep 8, 2026

Uh oh!

SchSeba commented Sep 9, 2026

Uh oh!

SchSeba commented Sep 9, 2026

Uh oh!

SchSeba commented Sep 10, 2026

Uh oh!

SchSeba commented Sep 10, 2026

Uh oh!

tssurya commented Sep 14, 2026

Uh oh!

SchSeba commented Sep 14, 2026

Uh oh!

danwinship commented Sep 14, 2026

Uh oh!

SchSeba commented Sep 14, 2026

Uh oh!

SchSeba commented Sep 14, 2026

Uh oh!

tssurya commented Sep 14, 2026

Uh oh!

SchSeba commented Sep 15, 2026

Uh oh!

SchSeba commented Sep 15, 2026

Uh oh!

elhadjici commented Sep 15, 2026

Uh oh!

openshift-ci-robot commented Sep 15, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 15, 2026

Uh oh!

SchSeba commented Sep 15, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 15, 2026

Uh oh!

SchSeba commented Sep 16, 2026

Uh oh!

SchSeba commented Sep 16, 2026

Uh oh!

SchSeba commented Sep 16, 2026

Uh oh!

tssurya commented Sep 16, 2026

Uh oh!

SchSeba commented Sep 3, 2026 •

edited

Loading

coderabbitai Bot commented Sep 3, 2026 •

edited

Loading

tssurya commented Sep 8, 2026 •

edited

Loading

tssurya commented Sep 16, 2026 •

edited

Loading